Revert "Upstream build bug for chromium"

This reverts commit 8bb82fde.

This is an incorrect workaround. It has been fixed in the GYP files
upstream.

Change-Id: If42f997747ce878b874508fdf7ae5a73a6fa1b2b

vpx_ports/arm_cpudetect.c

@@ -125,11 +125,7 @@ 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)
 {