[automerger skipped] Merge "SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END" into qt-qpr1-dev am: 5e7948d399
am: 4eff657ef2 -s ours
am skip reason: change_id I83b9b1d61b65dcc4a73d676e1f8be1e022c70302 with SHA1 a527524356 is in history

Change-Id: I55104fa72323868270fbcb69eb406a46c2b55758