am ffca173c: am 5da2dbbc: Merge "Move zygote init config to its own file."

* commit 'ffca173c853a2e312610d87f40957f696ac8364a':
  Move zygote init config to its own file.