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