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

Change-Id: I50bac7f3be35e0e4db1e2d124763a7c6fdf0002f