Merge "Convert fs_mgr_swapon_all() to use the new Fstab struct" am: bb72b808f4 am: 136645f3d3
am: d2918a1168

Change-Id: I8b2d3c23e797547cf4f43648fd44aafbb8517475