am c4f4b0f0: Merge "AudioManager: back to old setBluetoothA2dpOn()" into jb-dev

* commit 'c4f4b0f0a4905180314d1a681ddf5767ed1070ed':
  AudioManager: back to old setBluetoothA2dpOn()