Merge "fs_mgr: overlayfs: fsck scratch filesystem" am: db11fdcca3
am: d56857ce42

Change-Id: I6aba1ff1ed950d57ebccec4238fad10482df2d71