CHERRY-PICK: Mccloud: Add bluetooth device ID

BUG=chrome-os-partner:30450
TEST=Verified SDP output for DI contains 00E0:2421:0400

Original-Change-Id: Ie55159ed5660e2d5ee6ea8dddcacc12cfc5e81dc
(cherry picked from commit ba365f7493c8dd9ce37e5c40cc9cb73b5489a586)

Change-Id: I0f789dfb962b4075ca3d76d277085acce9cb95d8
Reviewed-on: https://chromium-review.googlesource.com/208591
Tested-by: Shan-fu Chiou <shan-fu.chiou@intel.com>
Reviewed-by: Scott James Remnant <keybuk@chromium.org>
Commit-Queue: Yung Leem <yungleem@chromium.org>
(cherry picked from commit a999b999166804ef5dc4336b8fcc90b1abc63346)
Reviewed-on: https://chromium-review.googlesource.com/208896
Reviewed-by: Yung Leem <yungleem@chromium.org>
Tested-by: Yung Leem <yungleem@chromium.org>
diff --git a/overlay-mccloud/chromeos-base/chromeos-bsp-mccloud/chromeos-bsp-mccloud-0.0.1-r1.ebuild b/overlay-mccloud/chromeos-base/chromeos-bsp-mccloud/chromeos-bsp-mccloud-0.0.1-r2.ebuild
similarity index 100%
rename from overlay-mccloud/chromeos-base/chromeos-bsp-mccloud/chromeos-bsp-mccloud-0.0.1-r1.ebuild
rename to overlay-mccloud/chromeos-base/chromeos-bsp-mccloud/chromeos-bsp-mccloud-0.0.1-r2.ebuild
diff --git a/overlay-mccloud/chromeos-base/chromeos-bsp-mccloud/chromeos-bsp-mccloud-0.0.1.ebuild b/overlay-mccloud/chromeos-base/chromeos-bsp-mccloud/chromeos-bsp-mccloud-0.0.1.ebuild
index 65c0903..50b82b0 100644
--- a/overlay-mccloud/chromeos-base/chromeos-bsp-mccloud/chromeos-bsp-mccloud-0.0.1.ebuild
+++ b/overlay-mccloud/chromeos-base/chromeos-bsp-mccloud/chromeos-bsp-mccloud-0.0.1.ebuild
@@ -19,4 +19,8 @@
 
 src_install() {
 	doappid "{63F299BF-A062-45D5-9050-F7B893BE820B}"
+
+        # Install Bluetooth ID override.
+        insinto "/etc/bluetooth"
+        doins "${FILESDIR}/main.conf"
 }
diff --git a/overlay-mccloud/chromeos-base/chromeos-bsp-mccloud/files/main.conf b/overlay-mccloud/chromeos-base/chromeos-bsp-mccloud/files/main.conf
new file mode 100644
index 0000000..a96e9a6
--- /dev/null
+++ b/overlay-mccloud/chromeos-base/chromeos-bsp-mccloud/files/main.conf
@@ -0,0 +1,2 @@
+[General]
+DeviceID = bluetooth:00E0:2421:0400