Merge "Split fork and specialize in zygote" into stage-aosp-master