am 8b557459: Merge "Fix emulator touchscreen." into honeycomb

* commit '8b557459da3e1ac27d8aaa527be2eb795e61d926':
  Fix emulator touchscreen.