iml
Fix up leaky alloctions.
138
fix cherry-pick
Merge branch 'master' into spdy

Conflicts:
	AndroidAsync/AndroidManifest.xml