Merge "Fix race condition in AudioTrack::releaseBuffer()" am: 9242b79e17

Change-Id: I41e0f86493fd4341212a7ae22ce015d670365648