am 64c7677a: Merge "Try to improve ViewTest#testInputMethodConnection" into jb-dev

* commit '64c7677ad1933e6faa4ca1726e48b3dfa35bb461':
  Try to improve ViewTest#testInputMethodConnection