Merge "bluetooth: Remove duplicate function definitions" am: db38221b9b am: 6c990300bb am: d2ac0af43f
am: a5994cb5db

Change-Id: I9f06263c51503742705f30b0e94a7e23fdf72584