Merge "Only build system_other.avbpubkey when AVB is enabled"