Merge "AAPT2: Support building, linking, and merging static libraries" into nyc-dev