Merge "Fix order of arguments in statsd_test_util header file" into rvc-dev am: abe1320056

Change-Id: I0ce6039d3ee4e737292b8356d14e604cf277eb3e