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