Merge "bluetooth: include what you use"
am: 2e7ce4d73f

Change-Id: I6ad653360422fa3aa2f39719ad3ddfe03b2cc640