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

Change-Id: I948e9c9a60327b9d25b6b5712904c780a52fdafa