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

* commit '7ee4c8d634d167560a42e8161c76494f54269efe':