evita: Use by-name partitions in fstab

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

Change-Id: Ibd29b172b7560b628aab0e8cec02930b0fdbd836
Merge branch 'cm-11.0' into kk_mkt