am d9435bce: am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework

* commit 'd9435bcecc820c8715d8b6b920fd43042418a1e9':
  Do not merge. Backport two fixes for InputMethethodFramework
tree: cc49bbb8abf379490d8a487b9e8b36e43e5ecb3b
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE