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

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