Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread