Merge "Call aapt2 link with argument-list" into nyc-dev