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

Change-Id: Ib8f1f364ba27c31ee564bbcd728fa81fc9fce17a