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

Change-Id: I96e5b25e62f350dec5865fe418b878bc1bc6b1c7