Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/04e4f52e1d5b
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #22476 from RudyLu/keyboard/Bug1048143_disableFTU_keyboard_test

Bug 1048143 - Should disable FTU and lockscreen when doing keyboard integration test.
r=gduan.

========

https://hg.mozilla.org/integration/gaia-central/rev/8ebe6cf50a00
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 1048143 - Should disable FTU and lockscreen when doing keyboard
integration test.
Bumping manifests a=b2g-bump
Bug 1038854 - Synchronize mutexes in pthread_cond_wait after recreating threads to avoid race conditions. Parts by Ting-Yu, r=khuey. Parts by Kyle Huey, r=thinker
Bug 1034308: Don't use NS_DECL_NSISTREAMINGPROTOCOLLISTENER on RtspMediaSource since it doesn't actually inherit nsIStreamingProtocolListener. r=ethan
Merge mozilla-central and b2g-inbound
Bug 1048888 - Initialize member variables to nullptr. r=botond
Bug 1043719 - Cancel pending gesture timeouts when a cancel is received. r=botond
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/cf6d955a1703
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #22366 from wilsonpage/1015249

Bug 1015249 - [Purchased Media] Update to use gaia-header

========

https://hg.mozilla.org/integration/gaia-central/rev/cebe4ac014b7
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1015249 - [Purchased Media] Update to use gaia-header
Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump
Merge fx-team to m-c. a=merge
Merge m-c to fx-team. a=merge