Merge "Remove unused rootdir/avb/*-gsi.avbpubkey modules"