Merge m-c to inbound.
Bug 936013 - Type check JS_NeuterArrayBuffer argument, r=jorendorff
Bug 925308 - Added test case.
Bug 937129 - Fix some concurrency issues in APZCTM::HandleOverscroll. r=kats
Bug 935089 - Make ArrayLength, ArrayEnd, and PodArrayZero accept mozilla::Array argument; r=Waldo
Bug 923333 - Replace docShell.setCurrentURI with something e10s-compatible (r=felipe)
Bug 930269 - Clean up SessionStore.restoreHistory (r=smacleod)
Bug 930269 - Rename SessionStore.restoreTab (r=smacleod)
Bug 930269 - Rename SessionStore.restoreHistoryPrecursor (r=smacleod)
Bug 930269 - Move saving of tab attributes (r=smacleod)
Bug 930269 - Rename SessionHistory.read (r=smacleod)
Bug 930269 - Create SessionHistory.restore (r=smacleod)
bug 909344 - treat U+007F as a control, not a printable character. r=roc
bug 909344 - reftest for display of stray control characters. r=roc
Bug 927954 - Adding rendertrace logging to the APZ code. r=botond

To use this logging, enable the #define at the top of
AsyncPanZoomController.cpp, run through the scenario you wish
to trace and collect the logs, and then paste them into the
textarea on the page at github.com/staktrace/rendertrace/.
Bug 916602 (Part 1) - Avoid null timestamp assertion in FrameAnimator::GetCurrentImgFrameEndTime. r=seth
Bug 916602 (Part 2) - Avoid null timestamp assertion when creating sentinel in FrameAnimator. r=tn
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/687919bdd494
Author: Luke Chang <lchang@mozilla.com>
Desc: Merge pull request #13681 from luke-chang/933252_fix_keyboard_jskanji

Bug 933252 - jp-kanji keyboard doesn't work, r=rudylu

========

https://hg.mozilla.org/integration/gaia-central/rev/62e9b4f1e78d
Author: Luke Chang <lchang@mozilla.com>
Desc: Bug 933252 - jp-kanji keyboard doesn't work
Bug 937973 - Fix discoverable not working problem, r=gyeh
Bug 932183: Part 1: Rename function and add comments in TCPSocket implementation to make it more readable. r=honzab