Updated Android Setup