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

Change-Id: I7840838d85406da4ba0dcff336d2a8647d71e4a8