Merge "Add AAPT2 to SDK build" into nyc-dev