Merge "[aapt2] Allow multi-line argument files" into main