am f20307a9: Merge "Returning JNI_ERR from JNI_OnLoad is still an error!"

* commit 'f20307a9e7ba4216790a36caa971e12183544ef8':
  Returning JNI_ERR from JNI_OnLoad is still an error!