Merge "Revert "Stop preloading EGL/GLES in Zygote""