firefox-21: fix building with system cairo
firefox-21: fix search box not working when built on xulrunner
Revert "firefox: Revert to 20.0"

This reverts commit 9875413c488651d46bc4aa4eb22c5b1a1f799109.