Merge remote-tracking branch 'cros/master' into HEAD

Nothing currently builds the master branch here.  Update it for use on
Bertha.

Change-Id: I9e3e2c4e2a50383e810b21608b61f72c3027c72c
Signed-off-by: Dylan Reid <dgreid@chromium.org>