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