Merge "ART: Disable CHA for AoT"
am: 92b601462f

Change-Id: Ie3a8fe6bfed776d3745941756e8142ea90766d10