fireball: Use by-name partitions in fstab

* Also change encryption to use the 'extra' partition.
* Also remove recovery specific fstab

Change-Id: I947530ea5d3c80fb7e483a4866fc0fad3cc54ac6