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

Change-Id: Ia767c5d02e6475633989b0cab2cbd33414f3bdeb