Merge "AudioFlinger: Prevent offload underrun during active playback" into nyc-mr1-dev