Merge "ART: Handle clobbering in verifier peephole" am: c95d341c9d
am: 6ed73d90d6

Change-Id: I43501526569d7682aeac246604908332f2c5fd51