am 9791bb42: Merge "Fix art test failures for Mips."

* commit '9791bb427fd812c1268edab6fb3ac7b82ad9fb93':
  Fix art test failures for Mips.