Merge "Removing assignments to localeScriptWasComputed in aapt." into nyc-dev