Merge "New AudioTrack C++ API for audio timestamps" into klp-dev