am 561a434b: Merge "Fix emulator trackball." into honeycomb

* commit '561a434b9769217b8936eea40b564bb9615f1a12':
  Fix emulator trackball.