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