Merge "MediaRecorder: add getSurface() api and SURFACE video source"