Merge "Remove EGL Hibernation"
am: 5e86147abc

Change-Id: I7afcd579a1ba81733540b280186bb7e3644b1816