Merge "ARMv6 optimized sad16x16"