Merge "Changes COMPILE_SDK to S." into ub-launcher3-master