Merge "Make --non-constant-id generates non final IDs for styleable." into jb-mr2-dev