Merge "bitstream: fix logical-not-parentheses warning"