[automerger skipped] Merge "Cleanup of ZygoteServer.java" into qt-dev-plus-aosp
am: b24f1041ca -s ours
am skip reason: change_id I26cc7e7ad54dc510ef0abc51a73190cf8e5096d1 with SHA1 b2b9ce54c3 is in history

Change-Id: I7451635545260171e63158e7e1fb37d9e0f19f8f