Merge "Dexlayout changes to support offset/size output of items."