Merge "Start using new C++ Fstab class widely" am: 07eea062d5 am: 7481fe9316
am: 86c33b9d16

Change-Id: I6cc864284911da9ad5e9939e12b388108fd8a38b