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

Change-Id: I7323117e46561c64c0f7f44b825815fb82399406