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

Change-Id: I2c1c9f9619918cbd839f09b9de195994e43a6921