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

Change-Id: I4c05ab43b0c56d9ecc1a28d80d7d1985b9f7edd0