Bug 894072 - Sync gaia to the commit specified in gaia.json, r=aki