Adios Goo

and small cleanup

Change-Id: I5b2c9665d8c59d0c599ac90b152d992bc7fb110b
Merge branch 'kk' of https://github.com/CarbonDev/android_vendor_carbon into kk

Conflicts:
	config/common.mk