init: Fix some more mergefails

Change-Id: I6fbb230e0f0f4e93f25fb571ae2fb6ccfd12398e

Conflicts:
	init/builtins.c
	init/util.c
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
Camera: Extend few data structures for QCom features.

Add message type for STATS_DATA and also the commands
which the application sends to start/stop histogram.
Also add few members to the face structure to extend
the face detection feature.

Change-Id: I3cc1c99ce40b58a029b1e048e6f84265833ac372
init: Allow basic environment variable expansion in env assignment

Allow environment variable expansion in 'export' command if the
value begins with "${_var_}" (where "${_var_}" will be replaced
with the current value of environment variable _var_).  Expansion
will only occur one time.

e.g.
export BOOTCLASSPATH ${BOOTCLASSPATH}:/system/framework/abc.jar
(cherry picked from commit 7940299507f15055851a6e8b61ae8d8a7d7f3484)

Change-Id: If9e4adfa1aba2c7a4ca243978ced3c46c2cb4d73
Do not add default route during ifc_configure

Avoid duplicate default routes.
Remove adding of default routes during interface configuration as
route add/remove operation is managed by ConnectivityService via netd.
(cherry picked from commit 4a48635c72d91cf8decb7653948fe0c76de46098)

Change-Id: I982b95a44bf91d3850ca7752e307c1b1b6a66ecf
Camera: Adds meta data message and commands

- This change adds support for meta
  data type notification messages and
  commands.

Change-Id: I4d19254be90ac43a40e7d02d74a3c7c1a2bad336
audio: Add support tunnel mode recording

Support for tunnel recording

Change-Id: I8e4a4ce4cde23296beb783c7d678db1fa8936af1