Merge "Remove custom annotation libs" am: 355f8c28b1

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

Change-Id: I3892eeaa0b31bbef26d4599bd0f37591956a1f79