Merge "Move to C++ Fstab class" am: 3978bb74ef am: 39551ead0e
am: 3607097f72

Change-Id: Ifa06459efa9aa95430347823fa016fd43bf25f17