am 61022b06: am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"

* commit '61022b06a352e5a6da382a09f51ea624581ada7f':
  stagefright aacenc: Zero-initialize a struct