Merge "Remove testdex variants in libcore."