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

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