Merge "Add android::fs_mgr namespace for new Fstab code" am: e85153ee9b
am: 576b7e7d09

Change-Id: Iff6e20af9f03b2518c0771fc57f8c4e3c9f0eeae