Merge "Enable bitwise-conditional-parentheses warning" am: 78620004fc

Change-Id: I2e8678c0e78ea4d97ac7bddac701f6916effd608