Fix themes_common

Change-Id: I7bca94cb2cc1eeda5eab433f76823aec90568738
Merge remote-tracking branch 'xn/kitkat' into kitkat