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

Change-Id: Icc87a2c4abc65472ff8ea70bce34a24a26edc54c