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

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