Merge "Migrate more unblocked modules." am: 2320e27eb1

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

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