am 064fab54: Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev

* commit '064fab54d743c6b00319ec08669e8b0872625317':
  Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats