add STREAM_FM

Conflicts:

	media/java/android/media/AudioManager.java
	media/java/android/media/AudioSystem.java
Add fm volume control

Change-Id: I8b3a10e3037c5bb3c7c044b86ddf9de5045d3e9d

Conflicts:
	core/res/res/values/strings.xml
	media/java/android/media/AudioService.java

Conflicts:

	core/res/res/values/config.xml
	core/res/res/values/strings.xml
	core/res/res/values/symbols.xml
vendor services (to arrays.xml)

Conflicts:

	core/res/res/values/arrays.xml
	services/java/com/android/server/SystemServer.java

Conflicts:

	core/res/res/values/arrays.xml
	services/java/com/android/server/SystemServer.java

Conflicts:
	core/res/res/values/arrays.xml
	core/res/res/values/public.xml
	services/java/com/android/server/SystemServer.java

Conflicts:

	core/res/res/values/arrays.xml
fix 1% battery

Conflicts:

	services/jni/com_android_server_BatteryService.cpp