[automerger skipped] Merge "Optimise the hit test algorithm" into oc-dev am: 6064d8fd4c am: 0348259446  -s ours am: 86c2ef5bde  -s ours
am: db63d3b644  -s ours

Change-Id: If3b34a69adddb0149bd26103570b31fb82f4e986