Merge "DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote"" into nyc-mr2-dev