Merge "AAPT2: Add targetConfig to AndroidManifest.xml" into oc-mr1-dev