add STREAM_FM
Add fm volume control

Change-Id: I8b3a10e3037c5bb3c7c044b86ddf9de5045d3e9d

Conflicts:
	core/res/res/values/strings.xml
	media/java/android/media/AudioService.java
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
fix compile
Merge remote-tracking branch 'cyanogen/cm-10.2' into cm-10.2
fix compile
Merge remote-tracking branch 'cyanogen/cm-10.2' into cm-10.2

Conflicts:
	media/java/android/media/AudioManager.java
	media/java/android/media/AudioSystem.java
Merge remote-tracking branch 'cyanogen/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cyanogen/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cyanogen/cm-10.2' into cm-10.2
fix 1% battery
Merge remote-tracking branch 'cyanogen/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cyanogen/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cyanogen/cm-10.2' into cm-10.2
Merge branch 'cm-10.2' of github.com:Quarx2k/android_frameworks_base into cm-10.2