Merge "Fix emulator trackball." into honeycomb