Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I139f101109f49aca1c2da5b8a064dec57a923a74
diff --git a/include/vnd_anthias.txt b/include/vnd_anthias.txt
index bf59dd5..f1a574c 100644
--- a/include/vnd_anthias.txt
+++ b/include/vnd_anthias.txt
@@ -7,4 +7,4 @@
 VNDUSERIAL_DBG = FALSE
 UPIO_DBG = FALSE
 BT_WAKE_VIA_PROC = TRUE
-PROC_BTWRITE_TIMER_TIMEOUT_MS = 2000
+PROC_BTWRITE_TIMER_TIMEOUT_MS = 0
diff --git a/include/vnd_bass.txt b/include/vnd_bass.txt
new file mode 100644
index 0000000..a96c1a5
--- /dev/null
+++ b/include/vnd_bass.txt
@@ -0,0 +1,16 @@
+BLUETOOTH_UART_DEVICE_PORT = "/dev/ttyHS99"
+FW_PATCHFILE_LOCATION = "/vendor/firmware/"
+BT_WAKE_VIA_PROC = TRUE
+UART_TARGET_BAUD_RATE = 3000000
+LPM_IDLE_TIMEOUT_MULTIPLE = 5
+LPM_BT_WAKE_POLARITY = 0
+LPM_HOST_WAKE_POLARITY = 0
+LPM_IDLE_THRESHOLD = 10
+LPM_HC_IDLE_THRESHOLD = 10
+PROC_BTWRITE_TIMER_TIMEOUT_MS = 0
+SCO_USE_I2S_INTERFACE = FALSE
+SCO_I2SPCM_IF_ROLE = 0
+BTVND_DBG = FALSE
+BTHW_DBG = TRUE
+VNDUSERIAL_DBG = FALSE
+UPIO_DBG = FALSE
diff --git a/include/vnd_smelt.txt b/include/vnd_smelt.txt
new file mode 100644
index 0000000..bcd0d0e
--- /dev/null
+++ b/include/vnd_smelt.txt
@@ -0,0 +1,14 @@
+BLUETOOTH_UART_DEVICE_PORT = "/dev/ttyHS6"
+FW_PATCHFILE_LOCATION = "/vendor/firmware/"
+BT_WAKE_VIA_PROC = TRUE
+UART_TARGET_BAUD_RATE = 3000000
+LPM_IDLE_TIMEOUT_MULTIPLE = 5
+LPM_BT_WAKE_POLARITY = 0
+LPM_HOST_WAKE_POLARITY = 0
+PROC_BTWRITE_TIMER_TIMEOUT_MS = 0
+SCO_USE_I2S_INTERFACE = FALSE
+SCO_I2SPCM_IF_ROLE = 0
+BTVND_DBG = FALSE
+BTHW_DBG = TRUE
+VNDUSERIAL_DBG = FALSE
+UPIO_DBG = FALSE