Merge "Clean up JNI calling convention callee saves."
am: 247250f280

* commit '247250f28028a5b2260ba2eb0a7f555a183b996a':
  Clean up JNI calling convention callee saves.

Change-Id: Ib1d1a96f4f6cbdbd384259e5138b76f6d965b13a