Merge "Merge "aacenc: fix timestamp off by one frame" into qt-dev am: 69fb36f0d1 am: 393728a945" into qt-r1-dev-plus-aosp
am: 20ce5600fd

Change-Id: I8231b83b89a042ab814559e918e65c3c28a42eb2