am 8260bf63: am 93bbc834: Merge "Fix aac decoder flush"

* commit '8260bf63e2fa974b524029f170d9ad17b69b884f':
  Fix aac decoder flush