Merge "Fix build issue for targets depending on libverity_tree" into main am: 4a07c71939

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3216313

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