Merge latest Skia into master (23 commits)
https://skia.googlesource.com/skia.git/+log/595599f..d1c550e
In addition, switch the build file from Android.mk to Android.bp. Like
the old Android.mk file, this file is also generated. Delete the old
makefile, and temporarily switch dm/Android.mk and bench/Android.mk to
link libskia instead of libskia_static (since our Android.bp file does
not yet produce the latter).
Restore SkUserConfig.h to include/config. Now that we export includes,
this should not require libraries that link against skia to update their
makefiles to explicitly include that directory.
Test: Presubmit checks will test this change.
BUG:26535125
Change-Id: Ia36e16282eaf294709ce41f57a0f40fe887c1546
