Merge "AAPT2: accept argument file list for -R"