Merge "Fix misc-macro-parentheses warnings in audio media jni." am: 9ecb10d1b5

am: ca3f49d594

* commit 'ca3f49d594f5c00e6b5d6817bcdb0af02e7224e6':
  Fix misc-macro-parentheses warnings in audio media jni.

Change-Id: I3828c9720f7fe91bc60058daeca2d598f0302d32

diff --cc core/jni/android_media_AudioRecord.cpp
Simple merge

diff --cc core/jni/android_media_AudioTrack.cpp
Simple merge

diff --cc media/jni/android_media_MediaDrm.cpp
Simple merge

diff --cc media/jni/audioeffect/android_media_AudioEffect.cpp
Simple merge

diff --cc media/jni/audioeffect/android_media_Visualizer.cpp
Simple merge