am c19d2a1d: Fix two calls to memset(3) whose arguments were reversed.

Merge commit 'c19d2a1d798d8626f196d878abcf23a14bee40af' into eclair-plus-aosp

* commit 'c19d2a1d798d8626f196d878abcf23a14bee40af':
  Fix two calls to memset(3) whose arguments were reversed.