Merge "Remove java.lang (re)definition tests from class_linker_test" am: efdfc85f24
am: 96d9131bb9

Change-Id: I47f68ece888380a5f7c818406b484f7b1031c239