Merge "metricsd: Fix upload service to compile with new libchrome version"