Remove both temp dirs in scap-recompile

Change-Id: Ib6d1441c18b9ef52af1d517f1846792a463ef0c9
Merge "Remove both temp dirs in scap-recompile" into production