Merge "Avoid JNI usage error when JNI_OnLoad throws" am: 8827cec419 am: 367d08eaf2 am: 72addd098f
am: 8cf2c38d25

Change-Id: If7597da780318f3fd342ddf83e15b99294750665