m4: Use by-name partitions in fstab

Change-Id: Id018ebc7691c4c1d8810377f165536c8ec8b1c23