Merge "AAPT2: Workaround for feature splits without namespacing"