Merge "Fix dexlayout debug info printing"
am: f856934689

Change-Id: Idcba932c1ccd3ffad888cee8c6f221963a53fcf6