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

Change-Id: Ia1c5d9ac7feecad359a2e563b1ec7f40a1084541