Merge "Change StagefrightRecorder to use MediaCodec"