Working on android code port