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

* commit '23a813e17d94083c24a34559864722c809b4e0f7':
  Avoid using String.format in MediaRecorder