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

* commit '922b88cd4203482b66ea4bee28e9921717ad2e6a':
  ART: Fix TypeConversion from long const to float on x86_64

Change-Id: I6bab607cad3e1d2bc81977c363531d942edbe4cd