Re-fix build errors from upgrading to clang 3.9 .

Re-fix build errors from upgrading to clang 3.9 .

This reverts commit 5526c1718b43d77d90850ec0409a21ecfc975b2c (https://codereview.chromium.org/1778663003) and implements it per jpp's suggestion.

BUG= none
R=jpp@chromium.org

Committed: https://gerrit.chromium.org/gerrit/gitweb?p=native_client/pnacl-subzero.git;a=commit;h=c10c15696dc09b9d8c081f6372d19faaa8ecff2b

[Jim Stichnoth, 2016-03-10 13:44:25]

Description was changed from

==========
Re-fix build errors from upgrading to clang 3.9 .

This reverts commit 5526c1718b43d77d90850ec0409a21ecfc975b2c.

BUG=
==========

to

==========
Re-fix build errors from upgrading to clang 3.9 .

This reverts commit 5526c1718b43d77d90850ec0409a21ecfc975b2c
(https://codereview.chromium.org/1778663003) and implements it per jpp's
suggestion.

BUG= none
==========

[Jim Stichnoth, 2016-03-10 13:44:25]

stichnot@chromium.org changed reviewers:
+ eholk@chromium.org, jpp@chromium.org, kschimpf@google.com, sehr@chromium.org

[John, 2016-03-10 15:41:49]

lgtm

thanks!

[Jim Stichnoth, 2016-03-10 16:19:37]

Description was changed from

==========
Re-fix build errors from upgrading to clang 3.9 .

This reverts commit 5526c1718b43d77d90850ec0409a21ecfc975b2c
(https://codereview.chromium.org/1778663003) and implements it per jpp's
suggestion.

BUG= none
==========

to

==========
Re-fix build errors from upgrading to clang 3.9 .

This reverts commit 5526c1718b43d77d90850ec0409a21ecfc975b2c
(https://codereview.chromium.org/1778663003) and implements it per jpp's
suggestion.

BUG= none
R=jpp@chromium.org

Committed:
https://gerrit.chromium.org/gerrit/gitweb?p=native_client/pnacl-subzero.git;a...
==========

[Jim Stichnoth, 2016-03-10 16:19:39]

Committed patchset #1 (id:1) manually as
c10c15696dc09b9d8c081f6372d19faaa8ecff2b (presubmit successful).