Reconcile bluetooth includes with cm-11.0

Change-Id: I3e892ce61f210b58a08c4dae23f34784c6bb78cd