This change abandons cancatenating lists in "srcs" and "resource_dirs" and using strings to each attribute to increase readability. Bug: 309709350 Test: m ShortcutLauncherDemo; m ShortcutLauncherDemo Test: m ShortcutDemo; m ShortcutDemo2 Change-Id: I84c1aad83fc17955db70077641dd866c367addb6