am 616c2cf1: am 90892d1b: Merge "Fix SIGABRT when playing mp4 file"

* commit '616c2cf1507898a0de4228b95d435fd36ec1e029':
  Fix SIGABRT when playing mp4 file