Fixup (1/2) - Revert "Update device_marvel.mk"

This reverts commit cf17f3c29954206e7000e38b23a24486087bedd6.
Fixup (2/2) - Revert "Another small fix"

This reverts commit 164617116f0876dc96b72469d9812c05c8477321.