Merge "ART: Clean up patching data in codegens."