Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1