[android] some modifications