Merge "Add annotations zip, and system and module-lib APIs" am: c9e2af2fdb

Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/1964930

Change-Id: Icf59dd006466c1132c14df0d4761c9fcf32203fc