Merge "Move over to the C++ Fstab class" am: b6d5cd20d7
am: 4e8e70a949

Change-Id: I08d7937f718739f6444780cbd0cc72634dba841c