Merge "AAPT2: Few tweaks to get shared-libraries working"