Annotate symbols correctly am: e6e6bee183 am: c3dad2e7b2 am: 033d8590c0

Original change: https://android-review.googlesource.com/c/platform/art/+/2229029

Change-Id: I74ffe433012bf7f663f29f73f99ebef4035b3c19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>