Merge "Revert "Add build rule to merge annotation zips"" into...

Merge "Revert "Add build rule to merge annotation zips"" into stage-aosp-master am: 47456591 am: 59e08f24 am: 385b55ed

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15951450

Change-Id: I0f11502d9a9957deb0e9dac70ff8df0806323678