Updates to android build