Merge "Store layout info in dex files"