* commit 'ade20f49a1a0226c06a6ae5d8074c9c1cc14a152': Revert "Make --non-constant-id generates non final IDs for styleable."