Fixes to have a clean package after the latest breaking changes from bleeding
edge.

BUG=

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