GitLab

Cherrypick r218021 from M30 branch.

> The skia shim headers were not being included at the front of the path
> because of a gyp processing issue, causing it to pick up the bundled
> headers instead by mistake; fix the gyp file.
>
> Also, some of the chromium code depends on non-public headers; add the
> required include path for this to work until we can fix the code.
>
> BUG=263818,274425
>
> Review URL: https://chromiumcodereview.appspot.com/23064007
>
> git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218021 0039d316-1c4b-4281-b951-d872f2087c98

Bug: 10402995
Change-Id: I092bac8f3b39d816d797809f414a34712277008d