Merge "Move to C++ Fstab class"
am: 3978bb74ef

Change-Id: I4d56702f985ad0d4adb68155c50b31d411c5ece6