Update to run in latest SDK

BUG=
R=sigmund@google.com

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