Merge "AAPT2: Workaround for feature splits without namespacing" into oc-mr1-dev am: 751e69b38b
am: 6385bbd860  -s ours

Change-Id: Ic1a8beb44a94af326e9af5a59a6431c1e77056bb