Merge "Avoid JNI usage error when JNI_OnLoad throws"
am: 8827cec419

Change-Id: I9292832f7baba2f95ad7c1084596239433bde55e