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

Change-Id: Idf923e6f6766eee6448cc57c3165930ad7fcb510