Merge "Add some documentation to MediaCodecInfo" into jb-mr2-dev