Merge "Deprecate two methods in MediaRecorder.java class"