Merge "Removing more code with API 21 dependencies." into ub-launcher3-burnaby