Merge "AAPT2: library resource compilation" into nyc-dev