Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev am: cdb1499198
am: 94632c7535

Change-Id: Id1809c736b938e4289a70af2e180630867ad4a4f