Merge remote-tracking branch 'goog/master-skia' into HEAD

Change-Id: I47c8d83d8aac3a2ed3883e255136f980a557e6e3