Merge "Revert "App compat: Temporarily rename CopyOnWriteArrayList.array -> elements""