Merge "Code cleanup in ZygoteConection.java" into qt-dev-plus-aosp