Merge changes from topic "cts-jvmti"
am: c8e169d4cd

Change-Id: I00347941e8e63cd7734351a5c8e1acdb5fdfd5f4