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

* commit '405720b5c380981c0fa301fbcc794e85e2801f08':