Merge "Fixes building from Android Studio" into ub-launcher3-master