am 2f86a384: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '2f86a384743fd3f608e8e65e4d5f5328a0aedfcb':
  bluetooth: bring up with bluedroid stack