Update from https://crrev.com/306724

This one actually contains the BUILD.gn reformats and updates
net_sql.patch and skia_build.patch to apply.

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