Merge "Add --trace_folder to aapt2"