s4-common: use new torch overlay option

Change-Id: I8335819ea28126be215c9412b6a2cb9d22d3f1ff