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

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

Change-Id: I964c2e898eacd76db377e988193849e89d1edcc4