am 6ead6cca: Merge "Add some documentation to MediaCodecInfo" into jb-mr2-dev

* commit '6ead6ccac9727993559c9f09f1e8da3c69ee3313':
  Add some documentation to MediaCodecInfo