am 20918be9: am b2cf160f: Merge "stagefright: add graceful handling when...
am 20918be9: am b2cf160f: Merge "stagefright: add graceful handling when setting port definition" into lmp-mr1-dev
* commit '20918be9':
stagefright: add graceful handling when setting port definition