am 8f4d720a: am cbfb8b2f: Merge "Ensure JNI primitive array type is appropriate."

* commit '8f4d720aa0fd72ad1846e129fc0dc1f11729d2a1':
  Ensure JNI primitive array type is appropriate.