Merge "Get rid of vendor specific video encoder component names from ACodec and OMXCodec" into jb-dev