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

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

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