am 2c596a53: Merge "Frameworks/base: Consistency in core/jni"

* commit '2c596a533488320444e28bbe37b7032589a0c5dd':
  Frameworks/base: Consistency in core/jni