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

Change-Id: I04d8440488fab320dcdd41f21d133b668602de31