Merge "Avoid recording CHA class status for dex2oat"