Merge "aapt: add option for stricter symbol generation" into mnc-dev