Bumping gaia.json for 1 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/cd25e6363bb5
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Fix merge conflict from Bug 880628

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>