am b68c1661: am 580ed263: Merge "stagefright: enable adaptive playback based...
am b68c1661: am 580ed263: Merge "stagefright: enable adaptive playback based on codec format key" into klp-dev
* commit 'b68c1661':
stagefright: enable adaptive playback based on codec format key