Merge "Add "[skia]" and function signature to Android's SK_ABORT" into udc-dev am: e569417206 am: 32c351be27

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skia/+/21890977

Change-Id: Ia4bb873a84157f47fb49186633b6d8cc28441a53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>