4982b6918a
This reverts commit a04cda9986366ab480ad8008c4d923271b05d78e. Conflicts: include/gui/SurfaceTexture.h libs/gui/SurfaceTexture.cpp Change-Id: Ib655016462c496ee2a27f7cb33a6e8b18cfe684a