Merge "Compile service-statsd against the system server SDK" into rvc-dev