Merge "Add android::fs_mgr namespace for new Fstab code" am: 990807a95f
am: 9594188eea

Change-Id: I2e51f997a0c362fa93ac1990b05fda86bf063522