am c0c2366c: Merge "stagefright: do not reject SPL4 files outright in...
am c0c2366c: Merge "stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder" into lmp-mr1-dev
* commit 'c0c2366c':
stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder