Roll external/skia 36a54c1b1..aee5714be (4 commits)

https://skia.googlesource.com/skia.git/+log/36a54c1b1..aee5714be

2019-06-06 egdaniel@google.com Manual revert of "Revise GrDataUtils to be more self-contained"
2019-06-06 egdaniel@google.com remove unused metal variable
2019-06-06 egdaniel@google.com Revert "Experimental: Add R_16 and RG_1616 to Ganesh"
2019-06-06 egdaniel@google.com Remove version from copy shaders.

The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-master-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.

Test: Presubmit checks will test this change.
Change-Id: I00b28890f199fc100cfc8bb9ca2bf5d0272e365e
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.