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

Change-Id: Ide956cdd66e356ab57b3528c2e7d3a7c2476914a