Merge m-c to fx-team a=merge

b2g/config/emulator-ics/sources.xml

b2g/config/emulator-jb/sources.xml

b2g/config/emulator-kk/sources.xml

b2g/config/emulator/sources.xml

b2g/config/flame/sources.xml

b2g/config/gaia.json

b2g/config/hamachi/sources.xml

b2g/config/helix/sources.xml

b2g/config/nexus-4/sources.xml

b2g/config/wasabi/sources.xml

dom/bluetooth/BluetoothCommon.h

dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp

dom/bluetooth/bluedroid/BluetoothA2dpManager.h

dom/bluetooth/bluedroid/BluetoothInterface.cpp

dom/bluetooth/bluedroid/BluetoothInterface.h

dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp

dom/bluetooth/bluedroid/BluetoothSocket.cpp

dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp

dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h

dom/ipc/TabChild.cpp