Merge "Allow compatibility suite also build a test list" am: 7fe5450b am:...

Merge "Allow compatibility suite also build a test list" am: 7fe5450b am: 30e367db am: 4d15c8b4

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

Bug: 201591516
Change-Id: Id124e6eb6d5c8c0ec31aca6b5878577519125c30
(cherry picked from commit 10218c72)