onyx: bluetooth: Bring inline with CAF

Change-Id: Ifdd65a48835e35d420e80826f899fa2663ca980b

bluetooth/bdroid_buildcfg.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 The CyanogenMod Project
+ * Copyright (C) 2016 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,13 @@
 #define BLUETOOTH_QTI_SW TRUE
 
 #define BTM_DEF_LOCAL_NAME   "OnePlus X"
-#define MAX_ACL_CONNECTIONS 7
-#define MAX_L2CAP_CHANNELS  16
-
-#define BTA_SKIP_BLE_READ_REMOTE_FEAT TRUE
-#define BTA_BLE_SKIP_CONN_UPD  TRUE
+// Disables read remote device feature
+#define BTA_SKIP_BLE_READ_REMOTE_FEAT FALSE
+#define MAX_L2CAP_CHANNELS    16
+#define BLE_VND_INCLUDED   TRUE
+// skips conn update at conn completion
+#define BTA_BLE_SKIP_CONN_UPD  FALSE
+#define BLE_PERIPHERAL_ADV_NAME  FALSE
+#define BT_CLEAN_TURN_ON_DISABLED 1
 
 #endif