Merge "Fix emulator touchscreen." into honeycomb