Merge changes I8ea62fc1,I73686bf8 into jellybean

* changes:
  bravo: reset to prealpha
  bravo: remove bt hci service