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

Change-Id: Idc183bedb542ecebee9ee2c6331cb847966a66c0