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

* commit '32901b397b590cc9133d21caab20b5ef01f0dd04':
  stagefright aacenc: Remove a stray semicolon