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

* commit 'b68c16616765576b411aa8a5a5cb809e09329d8f':
  stagefright: enable adaptive playback based on codec format key