correcting FTBFS patch for alpha

The last change for fixing up the FTBFS on alpha was saidly wrong. Due
missreading the patch provided in #650151 the implementing of the #elif
statement was wrong.
debian/gbp.conf: adopting experimental branch
Imported Upstream version 32.0~b1
Imported Upstream version 32.0~b1
Merge tag 'upstream/32.0_b1' into debian/experimental

Upstream version 32.0~b1

# gpg: Unterschrift vom Di 19 Aug 2014 21:03:05 CEST mittels RSA-Schlüssel ID 251D1DB0
# gpg: Korrekte Unterschrift von "Carsten Schoenert <c.schoenert@t-online.de>"
rebuild patch queue from patch-queue branch

modified patches:
icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch
debian-hacks/remove-non-free-W3C-icon-valid.png.patch

obsolete patches (fixed upstream):
porting-armel/fix-skia-for-ARMv4.patch