bring back some google stuff
Merge branch 'wx44' of https://github.com/WeaponX1/android into wx44

Conflicts:
	default.xml