Merge "AAPT2: Support generating Manifest.java"