Merge "AudioFlinger::getBuffer() always returns non-NULL"