Merge "metricsd: Add Android.mk."