Merge "fs_mgr: Create a C++ Fstab struct"
am: 0c7fb42949

Change-Id: I4978733e8605ef1e74cd51d745fd1a6218d06e99