Properly handle updating holo theme.

Change-Id: I157e597ee53894b1237c05dd2000b1da957b1968
Merge branch 'cm-11.0' into kk_mkt