Merge "Null check thread peers in JVMTI class callbacks" am: 698bd05488
am: e5bbcbc94c

Change-Id: Iacceb649c580d768de69d3437a2524dee3dc69aa