Merge "fs_mgr: Allow overriding the super partition name via the kernel commandline." am: f27803c435
am: 6b29efc528

Change-Id: I9b7bba8109c79b042d97c92a7a04847d2f6de393