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

Change-Id: Iec9bec5ba7f58c5ef5ef283bac16e2a1d6ebee6d