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

* commit '1527811984557ee0b5d6e476e84ed147e073cb45':
  stagefright aacenc: Zero-initialize a struct