Switched to CM 'external/skia'