am 49120dc8: build: Fix LOG_TAG define breakage, macro usage

* commit '49120dc867c7818511b5afec461dfc97d17eef58':
  build: Fix LOG_TAG define breakage, macro usage

diff --cc audio_a2dp_hw/audio_a2dp_hw.c
Simple merge

diff --cc bta/dm/bta_dm_act.c
Simple merge

diff --cc bta/gatt/bta_gattc_act.c
Simple merge

diff --cc bta/gatt/bta_gattc_utils.c
Simple merge

diff --cc bta/hh/bta_hh_le.c
Simple merge

diff --cc btif/src/btif_core.c
Simple merge

diff --cc btif/src/btif_dm.c
Simple merge

diff --cc btif/src/btif_gatt_client.c
Simple merge

diff --cc btif/src/btif_gatt_server.c
Simple merge

diff --cc btif/src/btif_gatt_util.c
Simple merge

diff --cc btif/src/btif_hh.c
Simple merge

diff --cc btif/src/btif_media_task.c
Simple merge

diff --cc btif/src/btif_sdp_server.c
Simple merge

diff --cc btif/src/btif_sock_l2cap.c
Simple merge

diff --cc btif/src/btif_sock_rfc.c
Simple merge

diff --cc btif/src/btif_storage.c
Simple merge

diff --cc hci/src/btsnoop.c
Simple merge

diff --cc hci/src/hci_inject.c
Simple merge

diff --cc hci/src/hci_layer.c
Simple merge