Select all .pem and .avbpubkey in otatools

Apex payload dev keys are stored as .pem files.
Apex payload also utilizes .avbpubkey as public keys.

Change-Id: I65ced74be02008b666d7bb608f0d0a3ef3769c9c
BUG: 138623265

core/Makefile

@@ -3627,7 +3627,7 @@ OTATOOLS_DEPS := \
 ifneq (,$(wildcard device))
 OTATOOLS_DEPS += \
   $(sort $(shell find device $(wildcard vendor) -type f -name "*.pk8" -o -name "verifiedboot*" -o \
-      -name "*.x509.pem" -o -name "oem*.prop"))
+      -name "*.pem" -o -name "oem*.prop" -o -name "*.avbpubkey"))
 endif
 ifneq (,$(wildcard external/avb))
 OTATOOLS_DEPS += \