Merge "Stop preloading EGL/GLES in Zygote" into nyc-mr2-dev
am: a959ccbc33  -s ours

Change-Id: I1ab396d5cfa65efa831ac4c7cfa5ec99fa7849a8