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

Change-Id: I274ea1fecbb343efa77788c80f4525a2fc05ba74