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

Change-Id: Ia86c535eaee402c6265c5a3425356b048ca85dea