Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev
automerge: aea6a23  -s ours

* commit 'aea6a23f121777190e5c8fa0b9a34ca7b2197188':
  Fix AudioTrackTest.testGetTimestamp