Merge b2g-inbound to m-c. a=merge

CLOBBER

b2g/config/dolphin/sources.xml

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-kk/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/BluetoothInterface.cpp

dom/bluetooth/BluetoothInterface.h

dom/bluetooth/bluedroid/BluetoothA2dpHALInterface.cpp

dom/bluetooth/bluedroid/BluetoothA2dpHALInterface.h

dom/bluetooth/bluedroid/BluetoothAvrcpHALInterface.cpp

dom/bluetooth/bluedroid/BluetoothAvrcpHALInterface.h

dom/bluetooth/bluedroid/BluetoothHALHelpers.cpp