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

Change-Id: Ia86f4824c74c550b4e9f3fca63241dd63b179a7d