Revert of Make ARM compiler happy after 0ecd9e1bd (patchset #1 id:1 of https://codere...

Revert of Make ARM compiler happy after 0ecd9e1bd (patchset #1 id:1 of https://codereview.chromium.org/1219863003/)

Reason for revert:
Revert in order to revert 0ecd9e1bd

Original issue's description:
> Make ARM compiler happy after 0ecd9e1bd
>
> BUG=
> TBR=hpayer@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
>
> Committed: https://crrev.com/bef1cbfdf9991f05ca142448098e8076cb7c2d26
> Cr-Commit-Position: refs/heads/master@{#29454}

TBR=ulan@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

Review URL: https://codereview.chromium.org/1221303002

Cr-Commit-Position: refs/heads/master@{#29469}