Merge "AAPT2: Workaround for feature splits without namespacing" into oc-mr1-dev