[Android] Revert x86 workaround changes for NDK r11c.
[Android] Revert x86 workaround changes for NDK r11c.

BUG=599327
R=primiano@chromium.org
TBR=mark@chromium.org

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

bittorrent/breakpad,bittorrent/breakpad,bittorrent/breakpad,bittorrent/breakpad,bittorrent/breakpad,bittorrent/breakpad,bittorrent/breakpad