Merge "Emit better (correct) timestamps that respect AAC upsampling."

            mAnchorTimeUs

                + (mNumSamplesOutput * 1000000) / mConfig->samplingRate);

    mNumSamplesOutput += mConfig->frameLength;

    mNumSamplesOutput += mConfig->frameLength * mUpsamplingFactor;

    *out = buffer;