Merge "fs_mgr: allow boot_devices to be supplies on the kernel commandline" am: 8f1fcd5b94 am: 0be6513e9a
am: 8a9ddccb20

Change-Id: I4cabd951c5bad171101f6d25f5b066c51f38eda9