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

Change-Id: I9cf0f5ba04d84de5056304b41a95af1b50ff1fca