Merge "Fix misc-macro-parentheses warnings in openmax." am: cb68066d06
am: 408c240973

* commit '408c24097392d52c38bd0e26e3d9a3c76e4cc0a4':
  Fix misc-macro-parentheses warnings in openmax.

Change-Id: I987a1c8cbd2b28becc7df69912cd0d88ed17c52d