am 96352104: Merge change 25550 into eclair

Merge commit '96352104fbb172d91f957551c772988e02d79f33' into eclair-plus-aosp

* commit '96352104fbb172d91f957551c772988e02d79f33':
  add system property to disable gzip, to help with debugging.