Merge "Move some small users of fstab to new C++ Fstab" am: 62040c53e0
am: 94b3574440

Change-Id: Ied287fa138b5b58351d37747e0ae8bd7ced8ef74