Merge "Added --debug-mode flag to AAPT2" into pi-dev