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

* commit '683b00d22932fdf050759df1fb0e6c273fe5e892':
  Fix art test failures for Mips.