Fixed flow. Removed spaces and tabs. Added log into goo.im

PS2: More code cleaning
PS3: Removed carriage return
PS4: Prevent NPE when using external gapps packages

Change-Id: Iad294e895cfa89fdcec3a612cefb160cbb620de4