Merge "AAPT2: Add Manifest fixing/validation"