enrc2b: kkify bluetooth

Change-Id: Ia810b85dc469872156516ebcfd8284a2aaa3d7ca
enrc2b: make sure the BT Vendor conf gets pulled in

Change-Id: I98e521d24f1298922e27f0cd5f0d2853294be3e0
Merge "enrc2b: make sure the BT Vendor conf gets pulled in" into cm-11.0
Merge "enrc2b: kkify bluetooth" into cm-11.0