Merge "Correctly make tools-common a test only dependency" am: ecb82e22e2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/13619682

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77cc8e3bc7272a165a08c8e0eb7a095c06a9f8bf