Track skia and bionic again from CM