Merge "Add AudioFlinger::PlaybackThread::Track::getTimestamp()" into klp-dev