Merge "Remove custom annotation libs" am: 355f8c28b1 am: a056f69a7a

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

Change-Id: If1a872b9c574e906eecdd9821b980709011e9f83