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

Change-Id: If1229fb74e3e3d0e20ba2466dc128dfa48de2566