Merge "Added a fixed point test in dexlayout" am: 3a7b0ff300
am: bf3b5e6934

Change-Id: I621542e6bb20e38c518c1bdd2387ff2f30f14fed