am 93bbc834: Merge "Fix aac decoder flush"

* commit '93bbc8343133b910aeae536617efce978040bbae':
  Fix aac decoder flush