Merge "Reconcile Zygote process name code with Q release."
am: 980681e525

Change-Id: I5df4cf4bd6e695b8236f7aec5262eeed32c8427e