Merge "Include resValues and buildConfigFields in the model." into studio-1.0-dev