am bcba0feb: Merge "Fix TextViewTest#testIsInputMethodTarget" into jb-dev

* commit 'bcba0febdb5baa6d5f58260ffd806a73495a27a1':
  Fix TextViewTest#testIsInputMethodTarget