am 800c8ab6: am 2644494a: Merge changes I8462f040,Ie471f40f

* commit '800c8ab68d695f1b6c5332c80a32316cdca69954':
  MediaCodec: Allow getting the codec info directly
  MediaCodec: Allow getting the chosen component name