Import "Fix high capacity (> 2GB) eMMC support."

Based on a diff by Cedric Tessier, nezetic at gmail dot com, thanks!

Discussed with and ok jsg@