Revert of Move immintrin/arm_neon includes to where they are used.

Revert of Move immintrin/arm_neon includes to where they are used. (patchset #2 id:20001 of https://codereview.chromium.org/2045633002/ )

Reason for revert:
Appears to have broken the ARMv7 aspect of the Google3 roll in bizarre seemingly-unrelated ways.

Original issue's description:
> Move immintrin/arm_neon includes to where they are used.
> 
> On my Mac (so, immintrin), this improves compile time, both wall and cpu,
> by about 16%.  To test I ran this on an SSD with files hot in their caches:
> 
>   $ env CC=/usr/bin/clang CXX=/usr/bin/clang++ ./gyp_skia && \
>     ninja -C out/Release -t clean && \
>     time ninja -C out/Release
> 
>   Before: 159 wall / 3367 cpu
>           159 wall / 3368 cpu
> 
>   After:  137 wall / 2860 cpu
>           136 wall / 2863 cpu
> 
> I also tried further refining immintrin down to emmintrin / tmmintrin / smmintrin etc.
> That made no signficant difference, so I've kept immintrin for its simplicity.
> 
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2045633002
> CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
> 
> TBR=reed@google.com
> No public API changes.
> 
> Committed: https://skia.googlesource.com/skia/+/12dfaaa53c23f3d03050bde8f64136ac1f44164a

TBR=herb@google.com,mtklein@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Committed: https://skia.googlesource.com/skia/+/50bcb189f8785a599a3024d8eba4681c2e8ca37a

[mtklein, 2016-06-07 23:46:24]

The CQ bit was checked by mtklein@google.com

[mtklein, 2016-06-07 23:46:25]

Created Revert of Move immintrin/arm_neon includes to where they are used.

[commit-bot: I haz the power, 2016-06-07 23:46:30]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2046213002/1

[commit-bot: I haz the power, 2016-06-07 23:46:45]

Description was changed from

==========
Revert of Move immintrin/arm_neon includes to where they are used. (patchset #2
id:20001 of https://codereview.chromium.org/2045633002/ )

Reason for revert:
Appears to have broken the ARMv7 aspect of the Google3 roll in bizarre
seemingly-unrelated ways.

Original issue's description:
> Move immintrin/arm_neon includes to where they are used.
> 
> On my Mac (so, immintrin), this improves compile time, both wall and cpu,
> by about 16%.  To test I ran this on an SSD with files hot in their caches:
> 
>   $ env CC=/usr/bin/clang CXX=/usr/bin/clang++ ./gyp_skia && \
>     ninja -C out/Release -t clean && \
>     time ninja -C out/Release
> 
>   Before: 159 wall / 3367 cpu
>           159 wall / 3368 cpu
> 
>   After:  137 wall / 2860 cpu
>           136 wall / 2863 cpu
> 
> I also tried further refining immintrin down to emmintrin / tmmintrin /
smmintrin etc.
> That made no signficant difference, so I've kept immintrin for its simplicity.
> 
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2045633002
>
CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
> 
> TBR=reed@google.com
> No public API changes.
> 
> Committed:
https://skia.googlesource.com/skia/+/12dfaaa53c23f3d03050bde8f64136ac1f44164a

TBR=herb@google.com,mtklein@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
==========

to

==========
Revert of Move immintrin/arm_neon includes to where they are used. (patchset #2
id:20001 of https://codereview.chromium.org/2045633002/ )

Reason for revert:
Appears to have broken the ARMv7 aspect of the Google3 roll in bizarre
seemingly-unrelated ways.

Original issue's description:
> Move immintrin/arm_neon includes to where they are used.
> 
> On my Mac (so, immintrin), this improves compile time, both wall and cpu,
> by about 16%.  To test I ran this on an SSD with files hot in their caches:
> 
>   $ env CC=/usr/bin/clang CXX=/usr/bin/clang++ ./gyp_skia && \
>     ninja -C out/Release -t clean && \
>     time ninja -C out/Release
> 
>   Before: 159 wall / 3367 cpu
>           159 wall / 3368 cpu
> 
>   After:  137 wall / 2860 cpu
>           136 wall / 2863 cpu
> 
> I also tried further refining immintrin down to emmintrin / tmmintrin /
smmintrin etc.
> That made no signficant difference, so I've kept immintrin for its simplicity.
> 
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2045633002
>
CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
> 
> TBR=reed@google.com
> No public API changes.
> 
> Committed:
https://skia.googlesource.com/skia/+/12dfaaa53c23f3d03050bde8f64136ac1f44164a

TBR=herb@google.com,mtklein@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Committed:
https://skia.googlesource.com/skia/+/50bcb189f8785a599a3024d8eba4681c2e8ca37a
==========

[commit-bot: I haz the power, 2016-06-07 23:46:46]

Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/50bcb189f8785a599a3024d8eba4681c2e8ca37a