Merge "Convert modules below in build/make/target/product/gsi/Android.mk to...

Merge "Convert modules below in build/make/target/product/gsi/Android.mk to Android.bp" into main am: f75a7bb8

Original change: https://android-review.googlesource.com/c/platform/build/+/3290605



Change-Id: I13fcca89e3959a5f944a8201387ec6fd24817126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>