[Job,MJ] begun setting up android to support new config