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

Change-Id: Ia2dc00e389cc96029e86975ab06b93ad4794f855