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

Change-Id: I8941916da85a2c221c5ac7d6bb5217bd9b79baef