Merge "CTS: Change JVMTI agent setup" am: 3be12a5cca am: 51ae78399c
am: ad19181e47

Change-Id: I928cc75c45ce8b33b1cd79f35a83befa8e30457a