Merge "Fix SoundPool.unload() return value" into mnc-dev