Fix build for language and library changes
Merge remote-tracking branch 'bjz/master' into servo