Merge "fs_mgr: overlayfs: empty system partitions excluded." am: e5aa946b63
am: 3b8ef8c890

Change-Id: I334ed6d2b62006cd9d9f653fc0dbdcdf72aa32d3