Merge "Clean up before upgrading to the latest tag" into main am: 7464a76ca1 am: 0b503157e7

Original change: https://android-review.googlesource.com/c/platform/external/libcap-ng/+/3196016

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