am b75e7b3c: am 251a057f: Merge "ART: Fix FP promotion"

* commit 'b75e7b3c99749d35f30ce655df0ed4ded52d4879':
  ART: Fix FP promotion