am fa243e07: am 466786b2: am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev

* commit 'fa243e07f062058e7df01c052eb79086c21fbdbc':
  LiveSession: fix incorrect stream key (subtitle"s")
  M3UParser: trim spaces when parsing comma separated codecs.