[ak] Update to current bleeding edge changes

R=terry@google.com

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