am f6e59f57: Merge "More armv8 failures now that optimizing supports CONST_STRING."

* commit 'f6e59f57d0c0cbbbe64d6862507350e4853495cd':
  More armv8 failures now that optimizing supports CONST_STRING.