Work on issue #29939676: android.util.ArraySet static cache corruption

Clean up method names to be consistent with locking protocol...
hasn't uncovered a locking problem yet, though.

Also remove some dead code.

Change-Id: Icdfd320a420b2beb47c805c32ac04db4b61e6a8c
2 files changed