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

Change-Id: Ibdba7f15e0242e93580ec9ca16621995eadde9c1