Merge "fs_mgr: Allow overriding the super partition name via the kernel...
Merge "fs_mgr: Allow overriding the super partition name via the kernel commandline." am: f27803c4 am: 6b29efc5
am: db6a7222
Change-Id: I5415c15fb03f56da00f31ba0762b493accf83e72