Merge "Fix race condition in AudioRecord::releaseBuffer()" am: cc0dec6cc2 am: dbf756b997

Change-Id: I94d551b057982b2adcf9da326a16482378118bd3