Merge "Fix statsd_test mts build target" into rvc-dev