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