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

Change-Id: Ice6d3023349398b2ba5ed99588cc2f457377fb6d