Merge "AAPT2: Fail on invalid id names in compiled xml"