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

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