Sync with ToT

We've now put all the futility stuff into ToT, so we can stop work on this
branch. Make sure it matches m/master and just walk away...

BUG=none
BRANCH=none
TEST=none

Change-Id: Ic334c70ca43a9edc1ab391e09c10a92a20c6d0c7
Signed-off-by: Bill Richardson <wfrichar@chromium.org>