Merge "remount: Refactor fs_mgr_overlayfs_scratch_device()." am: 40a8b07e4d am: 24b57af864

Change-Id: Ifc6ac111724038c7067fcfb65766468361a4ce23