Use Utils instead su binary for s2w and dt2w and a few minor cleanups

Change-Id: I8489c9570398aec86dbee779e4294d033581b2ff