Merge "TextKeyListenerTest#testPressKey fails" into honeycomb-mr1