Merge "Update proguard flags." into ub-launcher3-master