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

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

Change-Id: I84da42c48c855410193f2e319507bc2e48031a66