jewel: Use by-name partitions in fstab

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

Change-Id: I68ed1aaa1d8b0a74b8eb16093d2f2a028b687ccb
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0