Merge "Revert "Rename Arrays.ArrayList to Arrays.ArrayAdapter.""