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

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

Change-Id: Ic55ea9204df8b1254e35eb22a3bc50d92786e37b