kitkat: Track a few more packagage

google (OS jars)
gson
spongycastle
libphonenumbergoogle
Conflicts:
	default.xml