Backed out changeset 7086cfb5b6fe (bug 1016529) for breaking the Android build