Merge \\"Fix misc-macro-parentheses warnings in hardware/ril.\\" am: 1648a3f50b
am: 929b0a7e35

Change-Id: Ifb4169b780d050fab31f0987dca810cada7307ce