This is basically the same patch as for ARM issue 1127003003

https://codereview.chromium.org/1127003003

BUG= https://code.google.com/p/nativeclient/issues/detail?id=4167
R=stichnot@chromium.org

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

Patch from Reed Kotler <rkotlerimgtec@gmail.com>.