am befc4c11: Merge "Make stream_music volume configurable." into lmp-dev
am befc4c11: Merge "Make stream_music volume configurable." into lmp-dev

* commit 'befc4c112e83bbec47f1755a4900473d2af8c856':
  Make stream_music volume configurable.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base