Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev