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

Change-Id: I5d4e05a128bfc0b1a58451228eba92fd6dfbfdcc