Merge "Build support libs with AAPT2" into nyc-dev