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

Change-Id: Icc8e058d80cb616d80b37976c8413a4ed32cd4a7