Merge "C2SoftAacDec: Fix reset while codec's stop()"