commit for android test 1

bunch of miscellaneous stuff