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

* commit '438e8be03a21da297ee2f3291b640de62e037bfb':
  metricsd: Add Android.mk.