Merge "aacenc: handle and warn overlapping timestamps"