Merge "Add missing rlib target kind." into main am: a832ba0258

Original change: https://android-review.googlesource.com/c/platform/development/+/2926814

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