Merge "Store layout info in dex files" into oc-mr1-dev