Merge "Add android::fs_mgr namespace for new Fstab code" am: 54ea49ba05
am: 0bc62d5680

Change-Id: Ice435221d6cbf1a08b781062abe16968446ba643