Merge "Changed AAPT2 to abide by AAPT resource whitespace triming." into pi-dev