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 am: efeaf511

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



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