am bb9a36c2: am 54b3c3c7: am 6c4cf7fb: Merge "Fix benign overflow in AudioTrack"

* commit 'bb9a36c24160e131db786d69dc4a794706708209':
  Fix benign overflow in AudioTrack