am 6fb5b1bd: Merge "Fix baseline for arm64."

* commit '6fb5b1bdd5cfcc3c32fedd6539670b01b5cda9a2':
  Fix baseline for arm64.