Fixed gapps script and the google service's defination in common.mk

Change-Id: Ie440f837fd2535010b8c24e5c42ab8ee274c2197