am 207cffe9: Merge "Frameworks/base: Fix services/jni warnings"

* commit '207cffe95a868ea21b74dd54e3ef7821162ce870':
  Frameworks/base: Fix services/jni warnings