Merge "Fix dexlayout debug info printing"