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

Change-Id: I67ec497f2bc56f444ad4cd2d06b477b046fd0e87