Merge "AAPT2: Add targetConfig to AndroidManifest.xml"