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

Change-Id: I29a056eb9d0ac5bc8db1f00b357d2fbbfbefa650