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

Change-Id: I9b362037be9e4a105e2386cbd8e513e324550a04