Merge "AudioFlinger: Properly account for underruns" into qt-dev am: 377cc84da5
am: 88074c7df7

Change-Id: I20559f4d0f0fa83d082d4565509ae3afb5dddcc4