AOSCP-4.4.2: Track our own external/skia