Merge "Fold annotations." am: b3f3e7b3f7

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

Change-Id: I46f99a9ce4d198ea8a88bb86feff52b913761fa8