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

Change-Id: Id751b5a4c087fa062a31e88e153302a326fe34a8