Merge "Fixing issue with building velvet against lower support lib." into ub-launcher3-burnaby