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

Change-Id: I18434ab57b67cf1ff57df292c3797140ff331eb1