Merge commit 'f02964264f196447b03a88591a2964b67c318718' into froyo-plus-aosp
* commit 'f02964264f196447b03a88591a2964b67c318718':
Don't auto-select the system language in IME language selection screen.
Fixes http://b/2650378
On entering the selection screen, don't add the system language in addition
to other selected languages.
Change-Id: Id7a3b45df39a8493d17be668029eee139bf00ff3
Move java code to a different directory so that the unbundled
version doesn't try to compile the native code again.
Change-Id: I05cf9e643824ddc448821f69805ccb0240c5b986