am 03729fbe: am 5bc83fc3: Merge "Fix SIGABRT when playing mp4 file" into klp-dev

* commit '03729fbe43b0e36345463ef219d12a0d86daee90':
  Fix SIGABRT when playing mp4 file