am 706bb450: am 3e0f56df: Merge "Get rid of vendor specific video encoder component names from ACodec and OMXCodec" into jb-dev

* commit '706bb450ee7eb56691c61b40284136d9e2228444':
  Get rid of vendor specific video encoder component names from ACodec and OMXCodec