Merge "Fix timestretch AV sync" into nyc-mr1-dev am: d44ade926e am: ba46b47c4f
am: 3756e42e21

Change-Id: I4eea1153aa2334680ea890aebae01ecc6c38b6f1