Merge "Pass to the runtime the primary zygote option." am: c9bcf869db am: e21b8c9b57 am: b06bed082a
am: 269b05c370

Change-Id: Ia83233e71688260e8384fbec09448455e5667ee0