One more cleanup CL before the change to remove/replace mValues.

Shouldn't include any functional changes, mostly focused on
dead-code removal, also removing unused/unnecessary code/logic,
tightening up access modifiers (e.g. using private vs. public) as
much as possible, using Java's built-in iteration when applicable,
grouping variables by static/non-static and access modifiers (e.g.
private members last, etc).

Change-Id: I4fa6af136b5da0ae6183eadce4798746b18813cb
2 files changed