Merge "Add a --debug-mode option to aapt."