Merge "ART: Clean up patching data in codegens."
am: 38321bb87c

Change-Id: I55d43802d25352c7f267856abffc62866145daf5