am c3e20af0: Merge change Ib16749e2 into eclair-mr2

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

* commit 'c3e20af0b6aed8afe28be5fa08b8d69c6b50f34c':
  Refactoring the logging interface to remove dependence on NPP.