Merge "Make changes to support test_suites for test lib" am: f190db2a am:...

Merge "Make changes to support test_suites for test lib" am: f190db2a am: 0eaf156a am: 0cbaeda1 am: b2b968ec

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



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