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

========

https://hg.mozilla.org/integration/gaia-2_1/rev/0d66c171365a
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 1096839: add BMP support to shared/js/media/image_size.js to fix Gallery open activity

remove the now unused MAX_FILE_SIZE variable

========

https://hg.mozilla.org/integration/gaia-2_1/rev/63b10a813aad
Author: Luke Chang <lchang@mozilla.com>
Desc: Bug 1105977 - [FFOS2.0][Woodduck][SMS] The discard function is wrong

Conflicts:
	apps/sms/test/unit/activity_handler_test.js
Bumping manifests a=b2g-bump