Rename a few constants and clarify their meaning in comments. am: 2687277fd7 am: 4ba0234448 am: d64694fa35 am: 70a8ce1347 am: cdf2fad163

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

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