Merge "SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END"
am: 763cb4638a

Change-Id: I533d9ac132547aa284a92a5a40dd74d69d080889