Merge "Make SoundPool use MediaCodec"