Merge "Split fork and specialize in zygote" into stage-aosp-master
am: 3937fbb439

Change-Id: I129586249b68364b7813a146fc5b48936b948174