am d9a16d6e: Merge change 23852 into eclair

Merge commit 'd9a16d6e7daf8e58ebc7760530d9b015dbe4678d' into eclair-plus-aosp

* commit 'd9a16d6e7daf8e58ebc7760530d9b015dbe4678d':
  Fix a call to memset(3) with reversed arguments.