Merge "Fix "zygote is killed by signal 1""
am: 2372af9cd8

Change-Id: I3cad05514edcc122b4b523d08d39bcfc164e8a86