Upstream build bug for chromium

https://codereview.chromium.org/11413061/

The Android NDK automatically manages the include directories. Trying
to do so manually for the Android GYP files can cause the wrong setjmp.h
to be included.

Change-Id: I5c3769f983fcbad1ed602feda781690c6e4e97b3

vpx_ports/arm_cpudetect.c

@@ -125,7 +125,11 @@ int arm_cpu_caps(void)
 }
 
 #elif defined(__ANDROID__) /* end _MSC_VER */
+#if defined(CHROMIUM_BUILD)
+#include <machine/cpu-features.h>
+#else
 #include <cpu-features.h>
+#endif
 
 int arm_cpu_caps(void)
 {