Merge "AAPT2: Add library support"