am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1

* commit 'b71020ef4018195a21d2538ea3767b901610daf4':
  b/3392594 keep the remain touch points when one is ended.