am 22f36b1a: am 4c92f7ce: Merge "Revert workaround for Skia bug now that Skia...
am 22f36b1a: am 4c92f7ce: Merge "Revert workaround for Skia bug now that Skia has been fixed." into klp-dev
* commit '22f36b1a':
Revert workaround for Skia bug now that Skia has been fixed.