Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev am: 327dbfb94f
am: 1a10780c6b

Change-Id: Id7db030eb7b76e84ee6c0236e55e796f5fb00cf4