Merge "Add METADATA to xmp_toolkit: BSD=NOTICE" am: 49ee24c5ed am: 4eafdf35a1 am: ec3751d9c1

Change-Id: I8062010e743df8ab4ae2dc0f2a7f782509b7b440