Merge "Remove dependency on ASM util classes."