am cb3a7483: am cf4b3623: mako: clean up bluetooth configuration

* commit 'cb3a7483a59b8274eae3f260b5ad750a3fae68ca':
  mako: clean up bluetooth configuration