[automerger skipped] Merge "SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END" am: 763cb4638a am: a52acaf833 am: e1ea2d25b5 -s ours
am: 420a76d379 -s ours
am skip reason: change_id I83b9b1d61b65dcc4a73d676e1f8be1e022c70302 with SHA1 3ce301c6f3 is in history

Change-Id: I319f32c4e617636feaa7d9e9765f8c001d5eacc2