am f74588cb: Merge change 4060 into donut

Merge commit 'f74588cb88a9d9906ecf70ed6460f8bddc4810a0'

* commit 'f74588cb88a9d9906ecf70ed6460f8bddc4810a0':
  Trivial: renamed the parameters to be inline with the standard.
tree: 52fb27a31519f7bb74bfebf3f4ef3e78364c3657
  1. include/
  2. src/
  3. tests/
  4. Android.mk
  5. README