Annotate symbols correctly am: e6e6bee183 am: c3dad2e7b2 am: 033d8590c0 am: 8d61ae89fa am: f2601a5446

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

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