Merge "Added setAuxiliaryOutputFile to MediaRecorder and JNI"