am a85a0ac1: Merge change I4413e8bc into eclair-mr2

Merge commit 'a85a0ac1072c7653fdafa791416658154b76ac0d' into eclair-mr2-plus-aosp

* commit 'a85a0ac1072c7653fdafa791416658154b76ac0d':
  close file descriptors passed to drop box