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

Change-Id: I86c21f222595ba43068c20edd95582c66b1d4d15