Merge "MediaRecorderTest: add tests for getSurface() and SURFACE source"