Use by-name partitions in fstab

* Also change encryption to use the 'extra' partition.
* Also cleanup twrp flags