Merge "AAPT2: Accept a file with arguments when argument list is too long" into nyc-dev