Merge changes Ibd261f7b,Ifdd234ef,I0e2f0bc3

* changes:
  SurfaceTexture: add the abandon method.
  SurfaceTexture: add a deadlock scenario test
  SurfaceMediaSource: remove getAllocator method