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

* commit '4106cdf1f951560271c154282f9a7671893787fb':
  Fix SIGABRT when playing mp4 file