New goo.im folders for gapps

PS2: shorten phase names
PS3: prevent NPE in sw600p-land https://paranoidandroid.atlassian.net/browse/AOSPA-523?jql=
PS4: prevent crashing in some type of unknown gapps https://paranoidandroid.atlassian.net/browse/AOSPA-505?jql=

Change-Id: Ib233518f5fb8e7119e223a93f78030cbe4de1cac