Roll external/skia 38784599f..d85db6096 (5 commits)
am: aa0f23c192

Change-Id: I991490949b6011618ba96ceb9d40e9e6c44f4a21