Merge "Java API for AudioTrack timestamps" into klp-dev