Fixes to linking

R=efortuna@google.com

Review URL: https://chromiumcodereview.appspot.com//62543002