am 10eddabd: am 251a057f: Merge "ART: Fix FP promotion"

* commit '10eddabde056f8b4a132902508a7f6b03d4bb34b':