Merge "Fix misc-macro-parentheses warnings in services jni." am: fe91d2a83d
am: d05b6478d5

* commit 'd05b6478d5341f7d70e78fad031d2d426155f68a':
  Fix misc-macro-parentheses warnings in services jni.

Change-Id: Ibee251ace2e3f15b98a8f91da0d8450069500177