Change | to || for booleans

This will silence the warning -Wbitwise-instead-of-logical for newer version of clang.

fixes #1338

(cherry picked from commit 4834d8dd663761bcce56f302b15d1c397bd97eaf)
Change-Id: I0006e4fb23953c9097f97a2757e1789b2193f973
1 file changed