Merge "Revert "Avoid JNI usage error when JNI_OnLoad throws""
am: 8aaa601d88

Change-Id: I5aefad618a6c3beda429a26b1ffe644ff3914fe5