use jb_mr1_chocolate bluetooth

Change-Id: I75414534103475a53dad99eaf43023d1ea4f6d97
bluetooth: cleanup

Change-Id: I25a748bdb6f96f0e05cade2d90f507d4f89eb44b
mach-msm: bravo: use bt l2cap
mach-msm: mahimahi: fix battery