Fix -Wbitwise-instead-of-logical

Bg: http://b/215753485

This warning is triggered by the new clang-r445002 prebuilt.

error: use of bitwise '|' with boolean operands [-Werror,-Wbi
twise-instead-of-logical]
        if (match_str == "}" | match_str == "},") {
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                             ||

Test: Build with new clang and verify absence of warning.
Change-Id: I91465a30e33827317731c8874489eeafd89adfa6