ville: Use by-name partitions in fstab

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

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