Merge "vp9 register checks only apply to vp9"

test/register_state_check.h

@@ -82,8 +82,8 @@ class RegisterStateCheck {
 
 }  // namespace libvpx_test
 
-#elif defined(CONFIG_SHARED) && defined(HAVE_NEON) \
-      && !CONFIG_SHARED && HAVE_NEON
+#elif defined(CONFIG_SHARED) && defined(HAVE_NEON) && defined(CONFIG_VP9) \
+      && !CONFIG_SHARED && HAVE_NEON && CONFIG_VP9
 
 #include "vpx/vpx_integer.h"