Merge "Modify calling of NEON code in sub-pixel search"