am 6f562a3a: Merge "Make Release(JNI_COMMIT) faster"

* commit '6f562a3aee2b866d1f8a8a5773d81e0593069b3e':
  Make Release(JNI_COMMIT) faster