Merge "Revert "Revert "goldfish: remove system partition from fstab"""