am 07c6ddb4: am 3b939a5e: am 02a4ec21: Merge "avcenc: Remove a leftover define"

* commit '07c6ddb431c784a24a70a5a91d8a454e9c1dde5d':
  avcenc: Remove a leftover define