Merge "Code cleanup in ZygoteProcess.java."