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

Change-Id: Ifd87a842d3ab024d3f473aa1a98e5a1ce8a649b7