Merge "Add --no-compile-sdk-metadata switch to AAPT2"