Merge "Store layout info in dex files"
am: f0c66eb04d

Change-Id: Ic35e0fdde8fb7313252b01cc64bd985426ca9421