Fix build
Merge branch 'linaro' of github.com:ModdedPA/android_packages_inputmethods_LatinIME into linaro