am 2bf76b98: am 3e61e413: am 32901b39: am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon" * commit '2bf76b98': stagefright aacenc: Remove a stray semicolon