Merge "SoftAAC2: calculate timestamp from aacSampleRate"