Merge "Update the list of header files included from system/bt"
am: 7cf5a8f4dc

Change-Id: I89f258697dfe81c2fd6ca3a6ab2625d5b3bff132