am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the...
am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches
* commit 'a681f36f':
Make sure we use xmp_toolkit from external instead of the precompiled JAR.