Merge "bluedroid: use correct header file."