Merge "AAPT2: Fixed id parsing error" into pi-dev