Merge "ART: Fix TypeConversion from long const to float on x86_64"