Merge "ZygoteConnection.java: Remove dead code --peer-wait"