Upgrade jacoco to v0.8.4 am: 9b5f0cebfe
am: 12dee3496f

Change-Id: Ied87e81d2a101afa03f65e70e3c85410c6ceb2b0