Merge "Remove EGL Hibernation" am: 5e86147abc
am: eccef21647

Change-Id: Iffa69ccfeb0b80fab8d5e92873099413f7c2b560