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

Change-Id: Ib46b73cccca19b683021ce7a7aea08fcb4df82e3