added android changes from android-seekbar branch

** attempt to do a manual merge