Merge "Remove no-op references to obsolete variables." am: c182b2e5fe

Original change: https://android-review.googlesource.com/c/device/generic/art/+/1326040

Change-Id: I63757c0d04572bb600fdb73d4ec2d2d1321f2ce2