Merge "Remove EGL Hibernation" into nyc-mr1-dev-plus-aosp
am: 5586d34df6

Change-Id: I6cfdca8ce1b663e1703b54fb4dc5346f8998d4de