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

* commit 'edff13c9aeaa7c4ea42356f2a77c3bb95ccf9100':