am 35b884f8: am be3dc575: am 402120a2: Merge "Wait for secondary zygote before bringing up the system_server."

* commit '35b884f88e39c97056e71f329e73812a142103b5':
  Wait for secondary zygote before bringing up the system_server.