[automerger skipped] [automerger] Optimise the hit test algorithm am: 3b6f84b77c am: 5b224ccf41 skipped: eb86ac42e6 am: a60d0b2e93 am: a16b03c540 am: acb5b014af am: c62d510887 am: ea648c6a2b am: 83d9688077 am: ce1d540693  -s ours am: ac169beb52  -s ours
am: 4ae55000b2  -s ours

Change-Id: I16b4f8d33496eb6f7770a56c1907aab0a69da0ae