Merge "Move jacocoagent into the bootclasspath" am: 68dad73d34
am: a6af8ef91f

Change-Id: I3fba1c3005056354a682e1e424fbb4f388cc16ab