Merge "Remove auto-common and auto-value-annotations" am: b650265517 am: 8a36a7e0b0

Original change: https://android-review.googlesource.com/c/platform/prebuilts/tools/+/1676405

Change-Id: Id61e893dc8de05e752bc3e9d7053f1088cd3f6cd