am 457e6170: Merge "New failure on optimizing/arm64 after CONST_CLASS support."

* commit '457e6170ac55e4cbede79a23b021422ef4ccd92f':
  New failure on optimizing/arm64 after CONST_CLASS support.