Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev