Merge "Remove EGL Hibernation" am: 5e86147abc am: eccef21647 am: b814df602f  -s ours
am: 64342ba6f1  -s ours

Change-Id: I6fe23d3d46a2d5bf41a5190a678d9bbb93ca606c