Rearrange recovery.fstab to update Wipe/Mount menu in recovery

Change-Id: I707dc65eaad907ad6db6a0c36bc072cb667a0010