Revert "Fix arm_neon.h"

This reverts commit a835f743147f97d6c2a74f02e8d5491237c824eb.
Revert "ARM: use aosp arm_neon.h"

This reverts commit 54fbca0b9e4c2fd7a5a15b276c1d8e5b371aa2ed.