Merge "bluetooth: include what you use" into oc-dev
am: 86bf840964

Change-Id: Icb5c9beb6e1f04e9f2b0d012f7a449aed4100023