Actually add new ButtonOptionWidget theme to build

Follows-up Id32b501599519.

Change-Id: I7723e696f4acc59c539843470aa2c3764a308ffa
Merge "Actually add new ButtonOptionWidget theme to build"