Merge tag 'android-14.0.0_r50' into staging/lineage-21.0_merge-android-14.0.0_r50
Android 14.0.0 Release 50 (AP2A.240605.024)
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZmdzqQAKCRDorT+BmrEO
# eNrYAKCLpk7bY/t3Stnd8g0BanMyrVvYSACfRLFVFD5JMR29xyjbVoMWFdesW/w=
# =5ETb
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 11 00:44:09 2024 EEST
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2530 signatures in the past
# 2 years. Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78
# By Aditya Choudhary (1) and others
# Via Automerger Merge Worker (7) and others
* tag 'android-14.0.0_r50':
bpfloader: remove duplicate code
Migrate Test Targets to New Android Ownership Model
Add uprobestats path to BpfLoader.
Conflicts:
bpfloader/BpfLoader.cpp
Change-Id: I9d83b6f675672417fe8d39316b448341da4d5da9