am 20c906a8: am a101befb: Merge "Lose some unnecessary JNI from the zygote."
automerge: a95b568

* commit 'a95b568f9afcabb067f5ec8ef602800a89d273ee':
  Lose some unnecessary JNI from the zygote.