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

Change-Id: I6fa17b799a43a8a84786819b5ea2c741d5fc2626