am 0f54e0ba: am ccb0806b: (-s ours) am 92b100b3: am 3670eab0: Merge "metricsd: Add Android.mk."

* commit '0f54e0ba8e35d666febc3a83ea54f8b0fd2af477':