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

Change-Id: Ic808a45467cd84261282cfe216a031f3af6c653b