Merge "Fix "zygote is killed by signal 1""