Merge changes I689cb0c0,I09603218

* changes:
  Add a 'release' method to the SurfaceTexture public Java API
  Mark Window-Manager-specific APIs on android.view.Surface as @hide