Merge "Revert "Avoid JNI usage error when JNI_OnLoad throws"" am: 8aaa601d am: 6b570686 am: 45c3850d am: 0edfd00d Change-Id: I60081b1a479d9cf34c81cf0c110addd759cf893e