Merge "AAPT2: Shared library support"