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

* commit '92b100b3e772f4abb22091924e147eb924d80fed':
  metricsd: Add Android.mk.