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