Merge "Remove no-op references to obsolete variables." am: c182b2e5fe am: a80c59e58a am: 0e92ac6b74 am: 2c57993d35 am: 8540905316

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

Change-Id: I5c4af778a2d44e5f2dc9ae918c61e0244311e11c