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

Change-Id: I45be197886591a4a6dd0f1b0cfb6e92fc3105bfd