fix merge

Change-Id: I826815b05e94eb8793cdf3971b72b70da26e9884
qcom-fm: audio: Add support for FM feature

-Define audio stream for FM
-Define audio source for FM RX and FM RX A2DP

Change-Id: If24e4c32916f6614e3367b4c9f2cd828562e0347

Conflicts:
	include/system/audio.h
audio: Fix input enums for pre-4.2 audio blobs

Change-Id: Iec9f8d915d069168664d2cd873574db7fe5cddc7