Merge "Fix rounding error accumulation of audio timestamp" am: cfa3f49644
am: 9cedc5ad17

Change-Id: I3f67b7469f01b802b4eaa4136dbf914ca50438e4