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

Change-Id: I4eedf7b2f9ac26bc113285bdddb98b7f3d0eef70