Fix return position
Fix java build issue for android src