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

Change-Id: I76ef65d27191c60038d21a8e8153ae23b630879d