Merge "Replace use of java.util.HashMap with android.support.v4.util.ArrayMap." into ub-launcher3-master