Fix mergefailure in liblog

Change-Id: I092acba9496eefea35bff7561617e15f5424fb97
Fix gr_text() syntax until minui gets updated

Change-Id: Ie6d72013944d7ce6d2c0a244862b464e513fa389
init: Fix some more mergefails

Change-Id: I6fbb230e0f0f4e93f25fb571ae2fb6ccfd12398e
Remove QCOM_BSP from here for now

Change-Id: I0482aaf67b9f60946d5f0bac9906b94d66bab6f5
system/core: New stream type and flag for incall music delivery

- Add new stream type and flag for incall music delivery

Change-Id: I54d0d820d2dbb888d2e0cebdca63be2856eb00d8
system/core: Add tunnel format frame size

Add tunnel mode formats frame sizes to audio.h. This ensures frame
size definition in one place.

Change-Id: Ia01cb4cba003e538a53aaa18330ef860367859c1

Conflicts:
	include/system/audio.h