Merge "stagefright aacenc: Remove a stray semicolon"