Merge "Hide deprecated MediaRecorder.java APIs"