Merge "Remove the rest of users of the old style fstab" am: 286684f835
am: 9eaed18adb

Change-Id: Ie3823464993f17e9335a31901d4b59a38a84451d