Merge "Added --debug-mode flag to AAPT2" into pi-dev
am: 498baa82e6

Change-Id: I212efa4392f4da28817f88d589f865d17495f17c