[TIMOB-15739]Fixing up android remote mode build logic