Merge "Bug 3438258 Add SurfaceTexture as MediaPlayer sink"