am 3366bb25: (-s ours) am 2fe8aed7: Merge "Add support for code coverage."

* commit '3366bb2583deade3902de982871555521a1ae845':
  Add support for code coverage.