ifdef around stdint on android for x86 builds

BUG=none
TEST=none
Review URL: https://webrtc-codereview.appspot.com/930022

git-svn-id: http://libyuv.googlecode.com/svn/trunk@495 16f28f9a-4ce2-e073-06de-1de4eb20be90

README.chromium

 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 494
+Version: 495
 License: BSD
 License File: LICENSE
 

include/libyuv/basic_types.h

@@ -14,8 +14,12 @@
 #include <stddef.h>  // for NULL, size_t
 
 #if !(defined(_MSC_VER) && (_MSC_VER < 1600))
+#if defined(__ANDROID__)
+#include <sys/types.h>  // for uintptr_t on x86
+#else
 #include <stdint.h>  // for uintptr_t
 #endif
+#endif
 
 #ifndef INT_TYPES_DEFINED
 #define INT_TYPES_DEFINED

include/libyuv/version.h

@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 494
+#define LIBYUV_VERSION 495
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT