Fix Android build.

Fix Android build.

On Android, in default include directory (e.g., android_tools/ndk/platforms/android-9/arch-arm/usr/include), same filename exists in both include/ and include/machine. In some cases, the compiler picked up the wrong header file. Change it to use only include/ as default. 

BUG=161417
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=168576

[Alpha Left Google, 2012-11-19 18:46:33]

http://codereview.chromium.org/11413061/diff/1/source/libvpx/vpx_ports/arm_cp...
File source/libvpx/vpx_ports/arm_cpudetect.c (right):

http://codereview.chromium.org/11413061/diff/1/source/libvpx/vpx_ports/arm_cp...
source/libvpx/vpx_ports/arm_cpudetect.c:104: #include <machine/cpu-features.h>
It's better that we upstream this change to libvpx, e.g.

#if defined(CHROMIUM)
#include <machine/cpu-features.h>
#else
#include <cpu-features.h>
#endif

There will be frequent updates to the source/ directory and your change will be
overwritten.

[wjia(left Chromium), 2012-11-19 19:41:48]

PTAL.

http://codereview.chromium.org/11413061/diff/1/source/libvpx/vpx_ports/arm_cp...
File source/libvpx/vpx_ports/arm_cpudetect.c (right):

http://codereview.chromium.org/11413061/diff/1/source/libvpx/vpx_ports/arm_cp...
source/libvpx/vpx_ports/arm_cpudetect.c:104: #include <machine/cpu-features.h>
On 2012/11/19 18:46:33, Alpha wrote:
> It's better that we upstream this change to libvpx, e.g.
> 
> #if defined(CHROMIUM)
> #include <machine/cpu-features.h>
> #else
> #include <cpu-features.h>
> #endif
> 
> There will be frequent updates to the source/ directory and your change will
be
> overwritten.

Done with CHROMIUM_BUILD flag. I will ask Johann to upstream this change.

[Alpha Left Google, 2012-11-19 19:42:18]

LGTM.