v3.0.101: fix merge failures
Revert "Patch P17 corruption bug on Samsung M8G2FA fwrev 0x11 eMMC parts"

Does no good on Latona

This reverts commit 5ec87c43743cf3c724298ae0965546d02faa47fc.