Merge "New failure on optimizing/arm64 after CONST_CLASS support."