am 6004df94: Merge "Keep AACEncoder around for a bit longer to have more time fix issues related to video editor engine"

* commit '6004df9408eee0118fa67b4cf2d7ff15b04c481f':
  Keep AACEncoder around for a bit longer to have more time fix issues related to video editor engine