Merge "Add libmediaextractor in SurfaceMediaSource_test"