Added unit packages for Android client