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

Change-Id: If929ce7c8b0532132b8bd6542d0268333dfd6ccf