am 89d1dd45: am fb9131bd: Merge "ART: Make unknown variant "mips64r6" go away"

* commit '89d1dd45fdfc5c2abe9e4b70885f1382c601a262':
  ART: Make unknown variant "mips64r6" go away