Merge "Fix missing #includes in external/bluetooth."