Merge "fs_mgr_overlayfs: Add scratch size override system property"