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

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