Merge "AAPT2: Add option to generate static library" into mnc-dev