Merge "fs_mgr: update to new androidboot.slot param" am: 0fc8a4b363
am: 64bf462eb9

Change-Id: Idab5bef714d80651e3402fb370e811310f5bbb35