Merged from r183296.

  Add missing library dependencies.