Merge "Handle JNI_ERR results from JNI_OnLoad functions specially." into dalvik-dev