Merge "Fix writing text version of styleable IDs. do not merge." into jb-mr1-dev