am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"

* commit '99985d98c23b32acc0014031d7b88ee4eed21a4b':
  Make SoundPool use MediaCodec