Refactoring android-utils -> lib utils