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

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

Change-Id: I9ad6d7a2c9e1a3264bf6175cdfcb148c0589e948