Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: 61f6182  -s ours
automerge: f3dd5ae

* commit 'f3dd5ae671d63ce5516b1ef7124f429dde3dc954':
  Fix AudioTrackTest.testGetTimestamp