Merge "Add android::fs_mgr namespace for new Fstab code"