[automerger skipped] Merge "Optimise the hit test algorithm" into oc-mr1-dev
am: bbfee3189d  -s ours

Change-Id: I46ea8080731ca5cd9690dff3e60953f1b2d7e930