Merge "ART: Fix FP promotion"