am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"
automerge: 6e14c57

* commit '6e14c5705c5acf9d6036060252f257a084cd7578':
  Make SoundPool use MediaCodec