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

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

Change-Id: Ife107276244aa7cbc94f5ad40a51cf31446abc9c