Merge "DO NOT MERGE: AAPT2: Allow undefined resources (placeholders)" into oc-dev