Merge "Avoid recording CHA class status for dex2oat"
am: fb25fbc60c

Change-Id: I71e8bd8df9117a016d752a31f85fdcf2e8164ecf