Relocate android code to Android module