Merge "fs_mgr: remount: add partition argument list" am: 4c46285e2e am: 14fea4f7a2
am: b6f63c5f1e

Change-Id: Ibc0bf49626dd4c8990f991e40239c9326ce50b8a