Merge "Revert "Avoid recording CHA class status for dex2oat""
am: 24ed4638f9

Change-Id: I9127ab9e81fc2d0914b6ce6253be68405fb68a49