Merge "Use c and cpp objects for gcov."
am: d579b8eb1f

Change-Id: I6490b5b6c443952ac672847df8748df31e5933ff