Merge "AudioTrack: Fix extended timestamp offset" into oc-mr1-dev
am: 7966b44126

Change-Id: I8fc2bc363261d5edfdcc55608f4a7cb7d0a5610f