am f5eafe40: Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken

Merge commit 'f5eafe40cd3f0890dd4ce98a63c8f95b786a3dd9' into gingerbread-plus-aosp

* commit 'f5eafe40cd3f0890dd4ce98a63c8f95b786a3dd9':
  Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.