update for language changes

Pre-works for upgrading androidport of Servo.