Having consistent import order will reduce chance of merge
conflict between internal and external master
Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Has the side effect of picking up changes to LocalePicker
that added support for 3 letter language codes.
bug: 10090157
Change-Id: I20b357c8a3e76c7cecdf623d9ed39c3751d07645