am 96c5d65b: am 251c8b3f: Merge "constify generated JNINativeMethod fn ptr tables"

* commit '96c5d65b0bef97c1315ea5d7568df912710383c7':
  constify generated JNINativeMethod fn ptr tables