Make SDK compatible with Android
Remove dependence on commons jar
Replace with same code relocated to package names that won't conflict with (incompatible) Android implementation