Merge "Removing multidex support" into ub-launcher3-master