Some build updates for latest jacoco

Bug: 36792868
Test: m -j
Change-Id: I817d12994bc795be3faa33ad7e63675e3072a88e
4 files changed