Merge "fastbootd: Don't include all of the fs_mgr namespace in commands.cpp." am: 5482189612
am: 2836aee649

Change-Id: I9720e52a8e53d54663f746506acaba4f55f516d0