add STREAM_FM

Conflicts:

	audio/AudioPolicyManagerBase.cpp
	include/hardware_legacy/AudioSystemLegacy.h
fix compile with 3.0 kernel

Conflicts:

	audio/AudioPolicyManagerBase.cpp
	include/hardware_legacy/AudioSystemLegacy.h

Conflicts:

	include/hardware_legacy/AudioSystemLegacy.h