Merge "Revert to android-specific CopyOnWriteArrayList"