Merge "Replace use of java.util.HashMap with android.util.ArrayMap in DrawableFactory." into ub-launcher3-dorval-polish