Change name of overlay subdir 'sku'->'theme' am: 3451f2454a
am: bfc95a2843

Change-Id: Ia784110ca7c389db9d85a76c6c69a8dfe8a7da63