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

* commit '54b3c3c7acf18226f6abf788a220837bc5737677':
  Fix benign overflow in AudioTrack