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

Change-Id: I33e92132b4422726928531da8be7a444cbd2fd64