Merge "vp9: fix high-bitdepth NEON build"