Merge "Convert *-developer-gsi.avbpubkey to Android.bp" into main