Merge "Ensure that --revert-annotation flag is not generated for everything...

Merge "Ensure that --revert-annotation flag is not generated for everything stubs" into main am: 236944ce am: fea5a8e8

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



Change-Id: I5e275214a8648f2fdd0e05baab67d661f2c30540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>