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

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

Change-Id: I79d66be9e1447dd4b3064ae6ff02f07279a154e6