bluedroid, bluetooth: Track cm-11.0 branch