Merge "Don't build for froyo. That's just silly."