Revert "Add missing Theme Chooser Vendors"

This reverts commit a9945102a659abbd35f44c677c69199c9353dc89.

Change-Id: I0a1a2a598a89f79daa0bc3f56c2d7a273f171334
Merge "Revert "Add missing Theme Chooser Vendors"" into 4.4