Fix some nits in android metrics reporter
am: 8cbf696f9f

Change-Id: I7f415c6eba58fa7ef7c950becbbc262f63de9639