Merge "Merge "Remove GLSurfaceView and release EGL context." into qt-dev am: 2d6f9aa60a am: df132d6a4b" into qt-r1-dev-plus-aosp
am: 10472627b6

Change-Id: Ia02cee7da344f3669a987f76e802877aa63b920d