am 3670eab0: Merge "metricsd: Add Android.mk."

* commit '3670eab0ba12471b8eddb894679cac824779dcb1':
  metricsd: Add Android.mk.