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

Change-Id: I4264fa3247ad81aff3194a5bec7e6c074354302e