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

Change-Id: I2c210fdbd21580c231c439be6b0c223fb0d799e5