bug 920316, bug 963686 - update gecko.git configs. r=hwine

--HG--
extra : rebase_source : 305bc1082c205cbbd7edd393af0c5131d0c7d6b3