am 3e61e413: am 32901b39: am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"

* commit '3e61e413435ed745336c44d63fb6ffa6378e393b':
  stagefright aacenc: Remove a stray semicolon