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

Change-Id: I8791a0cbfb32c25a0c73552c47509cce1d5f06e2