Modify build after breakage caused by JaCoCo.  Unfortunately requires
switching to JaCoCo.

Change-Id: Ie47aaf10d079e39a1c0a97788f07212aba91952f
Signed-off-by: Rob Adams <readams@readams.net>