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

Change-Id: I088a0ba5fd02460913c4e9d9bd7ae61c07c58a68