am 173b3657: (-s ours) am c142f5e4: Fix Android Keyboard crash on hdpi device

* commit '173b3657a84ff00a216dfd4d526fbe2e472ffff4':
  Fix Android Keyboard crash on hdpi device