Merge "CTS: Refactor JVMTI agent attach" am: 7a6e4da621
am: 84b339a1f5

Change-Id: Ibfebeca5cff9e5e887c3af9ef408b2e7fbc5c92b