libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_systemdependent.h

Index: source/libvpx/vp9/common/vp9_systemdependent.h
diff --git a/source/libvpx/vp9/common/vp9_systemdependent.h b/source/libvpx/vp9/common/vp9_systemdependent.h
index 161c381ad089ee8f02a1a10df8f3377ce89bcf07..fc77762def57fac7cc6467cd914fe67a81821c25 100644
--- a/source/libvpx/vp9/common/vp9_systemdependent.h
+++ b/source/libvpx/vp9/common/vp9_systemdependent.h
@@ -11,15 +11,14 @@
 #ifndef VP9_COMMON_VP9_SYSTEMDEPENDENT_H_
 #define VP9_COMMON_VP9_SYSTEMDEPENDENT_H_
 
+#include "vpx_ports/msvc.h"
+
 #ifdef _MSC_VER
 # include <math.h>  // the ceil() definition must precede intrin.h
 # if _MSC_VER > 1310 && (defined(_M_X64) || defined(_M_IX86))
 #  include <intrin.h>
-#  define USE_MSC_INTRIN
+#  define USE_MSC_INTRINSICS
 # endif
-#if _MSC_VER < 1900
-# define snprintf _snprintf
-#endif
 #endif
 
 #ifdef __cplusplus
@@ -50,7 +49,7 @@ static INLINE int round(double x) {
 static INLINE int get_msb(unsigned int n) {
   return 31 ^ __builtin_clz(n);
 }
-#elif defined(USE_MSC_INTRIN)
+#elif defined(USE_MSC_INTRINSICS)
 #pragma intrinsic(_BitScanReverse)
 
 static INLINE int get_msb(unsigned int n) {
@@ -58,7 +57,7 @@ static INLINE int get_msb(unsigned int n) {
   _BitScanReverse(&first_set_bit, n);
   return first_set_bit;
 }
-#undef USE_MSC_INTRIN
+#undef USE_MSC_INTRINSICS
 #else
 // Returns (int)floor(log2(n)). n must be > 0.
 static INLINE int get_msb(unsigned int n) {