Fix build for pedantic compilers.

Fix build for pedantic compilers.

1f895a06bd36 did not use parenthesis around a conjunction in a
disjunction.

NOTRY=true
TBR=bmeurer@chromium.org

Committed: https://crrev.com/489c6f43df05f5d33849bb8b1080434bf802b757
Cr-Commit-Position: refs/heads/master@{#35192}

[Benedikt Meurer, 2016-04-01 09:14:15]

lgtm

[Yang, 2016-04-01 09:16:35]

The CQ bit was checked by yangguo@chromium.org

[commit-bot: I haz the power, 2016-04-01 09:16:39]

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

[commit-bot: I haz the power, 2016-04-01 09:18:20]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-04-01 09:20:02]

Description was changed from

==========
Fix build for pedantic compilers.

1f895a06bd36 did not use parenthesis around a conjunction in a
disjunction.

NOTRY=true
TBR=bmeurer@chromium.org
==========

to

==========
Fix build for pedantic compilers.

1f895a06bd36 did not use parenthesis around a conjunction in a
disjunction.

NOTRY=true
TBR=bmeurer@chromium.org

Committed: https://crrev.com/489c6f43df05f5d33849bb8b1080434bf802b757
Cr-Commit-Position: refs/heads/master@{#35192}
==========

[commit-bot: I haz the power, 2016-04-01 09:20:03]

Patchset 1 (id:??) landed as
https://crrev.com/489c6f43df05f5d33849bb8b1080434bf802b757
Cr-Commit-Position: refs/heads/master@{#35192}