Merge "Remove sixtap/bilinear 4x4 neon implementations"