This reverts commit 339929ba16. Bug: 11866784 Bug: 13888366 Bug: 15781377 This doesn't build with LOCAL_SDK_VERSION := 19 for UnbundledLatinImeGoogle. Change-Id: Idf8bd335b076152265f245f578dadf651e291878
339929ba16