Merge "Update TestThread2 Stacktrace in align to OpenJDK 8u121-b13" am: 5360a52f6d am: a8e11be07f am: 390883751b

Change-Id: I35074f37b29f8c1987c01cdf5bff5d65ab6d5131