Removed android specific parts in java library and got junit tests to work