tree 96d5a2b4d5c15d0b4fb11c05f6454c495db5b821
parent 0f6de4fd867873e552d67ba145f8e993bffe41e1
parent d1c550e71fa72cfbf03b93c10ec8b9d1d109f8c2
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1482176081 +0000
committer Leon Scroggins <scroggo@google.com> 1482178710 +0000

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