Merge branch 'merge-bootstat-rewrite' into merge-bootstat

BUG=chromium:387186

Change-Id: I1c1d6fbae601b0ef12e303703c166090a533a157