Merge "Synchronize mediarecorder.h and MediaRecorder.java"