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

* commit '77ea1291b6d18f054095c7f1af336219253e00e7':