Fix preupload warnings.

R=sdefresne@chromium.org

Review URL: https://codereview.chromium.org/748823002