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

Change-Id: I80a31fbc0ad5ae8fa3551916448edc1bb9f949e5