Merge "Revert "Avoid JNI usage error when JNI_OnLoad throws"" am: 8aaa601d88 am: 6b5706864c am: 45c3850dcc
am: 0edfd00d9d

Change-Id: I60081b1a479d9cf34c81cf0c110addd759cf893e