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

* commit '629b1c4f2042ef0f1da4fe543cca34deedd3ba5d':
  Make --non-constant-id generates non final IDs for styleable.