Merge "stagefright aacenc: Zero-initialize a struct"