Cleaned up RSYNC_ARGS generation in scap-2

Change-Id: I7791fda1f4bb90d73604e227b339e00845469640