am 28ae70ce: am 23a813e1: am 996de2dd: Merge "Avoid using String.format in MediaRecorder"

* commit '28ae70ceac7d8295c3ba0dbd644c5cef56dc72b3':
  Avoid using String.format in MediaRecorder