Bug 1017438 - Use SL_PLAYEVENT_HEADATMARKER event to trigger CUBEB_STATE_DRAINED state callback. r=kinetik
Bug 1029251 - MP4Reader::Flush should grab lock in the right order. r=kinetik
BUG 920543 - Correct the 'Mime type in ondataavailable' test case r=rlin
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/4073b397d7b5
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #20906 from guilherme-pg/bug947985-fmd-icon

Bug 947985 - Include final icon for Find My Device.

========

https://hg.mozilla.org/integration/gaia-central/rev/7938357322c0
Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
Desc: Bug 947985 - Include final icon for Find My Device.
Bumping manifests a=b2g-bump
Bug 1027434 - Report non-main-thread stacks in SystemMemoryReporter. r=njn

This depends on tagged anonymous memory in order to avoid stacks merging
with adjacent non-stack virtual memory areas.
Backed out 5 changesets (bug 993197, bug 949617, bug 995489, bug 1029128) for Android test failures.

Backed out changeset 033d6271fd19 (bug 1029128)
Backed out changeset f568b1dc9880 (bug 1029128)
Backed out changeset daa9c46d19dc (bug 949617)
Backed out changeset 2baf5c61cbf5 (bug 995489)
Backed out changeset 654c1f0c88bc (bug 993197)
Bug 1024300 - Allow GMPs to be segregated by origin. r=josh
Bug 1024405 - Discard enqueued samples when making video decoders dormant. r=kinetik
Merge m-c to m-i
Bug 965967 - Use Moz2D instead of a Thebes backed gfxContext in PluginInstanceChild::PaintRectToSurface. r=mattwoodrow
Bug 1031199 - Disallow aWeight = 0 when calling gfxUserFontSet::AddFontFace. r=jdaggett
Bug 1031205 - Make gfxUserFontSet methods take already-parsed language override values. r=jdaggett
Bug 1028237 - Account for device offset for thebes layer masks. r=roc
Bug 1022852 - Fix setInputMethodActive test that rely on order of async message. r=yxl
Bug 1029956 - Fix mLayerRef init for color layers. r=dglastonbury

We didn't initialize the mLayerRef in the constructor of
DebugGLColorData. Just fix it.
Bug 1027138 - Revert fix from Bug 984075 and fix arrow rendering by extra gtk_widget_show() call. It realizes the arrow widget and allocates it a size. r=karlt
Merge mozilla-central to fx-team
Bug 1029128 - Fix strict-mode error in the JSON storage file. r=dolske
Bug 1029128 - Fix bug in failure case biting debugging mochitest failures. r=dolske