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

Change-Id: I584c6b7b81f46ade75cb069ced5249b340b6f8de