Merge "bluetooth: Remove duplicate function definitions"
am: db38221b9b

Change-Id: I3e0c507de5f60fc279e171d19e1776562e4b3d9b