Merge changes I9b8e1962,I7bb843ca

* changes:
  Temporarily don't return the current buffer in synchronous mode
  unify SurfaceTexture and Surface
tree: 754a54d7e649c17b24234744bbd19e44d9ea0e57
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE