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

Change-Id: Ia78ea687494c2125f68ba85a76bfa02c4c1f5c34