Merge "AAPT2: Support static lib referencing static lib" into mnc-dev