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

Change-Id: Idda084d760bb736870f921309709c4555a594d4b