bluetooth: remove warnings am: 90fc274838
am: f5368cd58c

Change-Id: I5453112982dc9a16091b51b8c5d8a59483e769d9