Merge "Tidy up our getAvailableLocales methods to actually ask ICU4C." into dalvik-dev