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

* commit 'c59abe4b38aa4d3dfe7f45ffefd0470d8825c009':
  Revert "Fix AudioTrackTest.testGetTimestamp"