Merge tip of tree Skia into master

Test: built and run angler-eng. ran hwui unittests: no new tests fail,
but text drawing unit tests were broken prior this CL.
BUG:26535125

Change-Id: I5fdca9a4a9f304402c995f442c4c0990cfb940a1