Merge "Cleanup of ZygoteServer.java" into qt-dev-plus-aosp