Merge "AAPT2: Fixup namespace implementation"