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

========

https://hg.mozilla.org/integration/gaia-central/rev/c699b0d240bc
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Re-land pull request #19770 from tauzen/Bug1017572 since it wasn't at fault for Gaia unit test failures.

This reverts commit 4152286b9cbadaa8fe2fecfa82226e99ae41a679.

========

https://hg.mozilla.org/integration/gaia-central/rev/ddf4f13d37c9
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Revert "Merge pull request #19912 from kamituel/Bug_1019169_byte_str_conv"

This reverts commit 0f5dc07363da7a3f27e3ad5f1f7f957265e79bd8, reversing
changes made to 763b7f62805570b1606b8738075318020af3fa7d.
Bumping manifests a=b2g-bump