Revert 170619 "Revert r170531"

This CL is relanding r170531.
The Android bot failure was already resolved,
so I'm relanding r170531 and r170536.

> Revert r170531
> 
> r170531 copied files to make the diff of r170536 saner.
> Now that r170536 was reverted, we need to revert r170531 at the same time.
> Otherwise, we'll leave meaningless files in the code base.
> 
> TBR=tkent
> 
> Review URL: https://codereview.chromium.org/221663003

TBR=haraken@chromium.org

Review URL: https://codereview.chromium.org/222613008

git-svn-id: svn://svn.chromium.org/blink/trunk@170723 bbb929c8-8fbe-4397-9dbb-9b2b20218538