am d7c4da3c: am 909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into klp-dev

* commit 'd7c4da3c1c33b5219d7d87ba698cd7d9c8750c41':
  stagefright: use CODECS field in EXT-X_STREAM-INF as fallback