Merge "AAPT2: Push more configuration code into the parser"