Merge "Fix dexlayout fixed point test"