Merge "Use the right path for compos_verify" am: 8895d4d295 am: 73b61417b6

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1994990

Change-Id: I6d95e2b3f7b3fd150f9e7ec4efc19fd0b0679015