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

Change-Id: I6c49d80d270d3877bce2652d687ef8434a68e333