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

Change-Id: Ic405b524faaa69f55eb1e29881afb3d241b7c8ef