[automerger skipped] [automerger] Optimise the hit test algorithm am:...

[automerger skipped] [automerger] Optimise the hit test algorithm am: 3b6f84b7 am: 5b224ccf skipped: eb86ac42 am: a60d0b2e am: a16b03c5 am: acb5b014 am: c62d5108 am: ea648c6a am: 83d96880
am: ce1d5406  -s ours

Change-Id: Ic5ff6005483d4f4af1d0b9d8547c00751942fada