Merge "AAPT: Include empty locale in getLocales" into oc-dev