Merge "Fix dexlayout fixed point test" am: 1171deea4c am: 7c9651c617
am: 94695ba20b

Change-Id: I9488e8fb20f10043369bd704c5afd983b89662ff