Merge "Cleanup of ZygoteServer.java"