Merge "aacenc: handle and warn overlapping timestamps" into qt-aml-media-dev
am: 4358fd9a69

Change-Id: I45dd9e925747862dc34d48f021386a48f99255b2