Merge "Remove EGL Hibernation" into nyc-mr1-dev-plus-aosp