Merge "Revert "Avoid recording CHA class status for dex2oat""