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

Change-Id: I3a27bcc32d70ddd1e1e3cc067160029eb409f881