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

Change-Id: I3b201cd80e90efc9f355673a2ed2a68979fb5fd1