am 0ed78ec7: am d81b9d22: Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev

* commit '0ed78ec7c4b659a1b6b0bd5e39428f882411a0ff':
  ISSUE 6849488 Bluedroid stack, remove system/bluetooth.