Merge \\\"Fix misc-macro-parentheses warnings in frameworks/ml.\\\" am: 5f58ad9b94 am: 4745c0f6f0
am: 683e1d1d6d

Change-Id: I38eae3863b1902f30ba7ded94c52485b24b7a6ff