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

Change-Id: Idcac3756eede932c7924ccc3ef3edc7e12b7a10b