Merge "Finetune some of the prefetcher parameters to a) buffer as much as...

Merge "Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers" into gingerbread