[automerger skipped] Revert^2 "Rough-in license metadata support to make." am:...

[automerger skipped] Revert^2 "Rough-in license metadata support to make." am: d0a24aa5 -s ours am: 0ef77e83 -s ours

am skip reason: Change-Id Ibd472fc1bedfdc228a704108f0280b13ab1c9333 with SHA-1 7a958209 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f81863f8e261cf76f20bf242ac65cfa7b620199