Merge "Migrating to android-x" into ub-launcher3-master