Merge "AAPT2: Honor --custom-package when writing Manifest.java"