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

Change-Id: Ibe5c935dfaf3f827d03fd7e1b77a16c4908cbcc4